* elf/dl-error.c (_dl_catch_error): Use __sigsetgjmp instead of

	setjmp.

2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d61341154..b2af78c42b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-12-17  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/dl-error.c (_dl_catch_error): Use __sigsetgjmp instead of
+	setjmp.
 	* elf/dl-error.c (_dl_signal_error): Use __longjmp instead of longjmp.
 	* elf/dl-minimal.c (longjmp): Remove definition.
 
diff --git a/elf/dl-error.c b/elf/dl-error.c
index be9209da22..b5374e949c 100644
--- a/elf/dl-error.c
+++ b/elf/dl-error.c
@@ -170,7 +170,8 @@ _dl_catch_error (const char **objname, const char **errstring,
 
   struct catch **const catchp = &CATCH_HOOK;
   old = *catchp;
-  errcode = setjmp (c.env);
+  /* Do not save the signal mask.  */
+  errcode = __sigsetjmp (c.env, 0);
   if (__builtin_expect (errcode, 0) == 0)
     {
       *catchp = &c;