2.5-18.1

[jlayton/glibc.git] / sysdeps / s390 / s390-32 / elf / setjmp.S

diff --git a/sysdeps/s390/s390-32/elf/setjmp.S b/sysdeps/s390/s390-32/elf/setjmp.S
index 0d1fa8e41d9291ae7033bcf307241fb962fe2467..ed28008a56ef233097b425e5990d8063027f5d29 100644 (file)
--- a/sysdeps/s390/s390-32/elf/setjmp.S
+++ b/sysdeps/s390/s390-32/elf/setjmp.S
@@ -1,5 +1,5 @@
 /* setjmp for s390, ELF version.
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
    This file is part of the GNU C Library.
 
@@ -46,10 +46,23 @@ END (__setjmp)
 
 ENTRY(__sigsetjmp)
 .Linternal_sigsetjmp:
+#ifdef PTR_MANGLE
+       stm    %r6,%r13,0(%r2)      /* store registers in jmp_buf */
+       lr     %r4,%r14
+       lr     %r5,%r15
+       PTR_MANGLE (%r4, %r1)
+       PTR_MANGLE2 (%r5, %r1)
+       stm    %r4,%r5,32(%r2)
+#else
        stm    %r6,%r15,0(%r2)      /* store registers in jmp_buf */
+#endif
        std    %f4,40(%r2)
        std    %f6,48(%r2)
-#ifdef PIC
+#if defined NOT_IN_libc && defined IS_IN_rtld
+       /* In ld.so we never save the signal mask.  */
+       lhi    %r2,0
+       br     %r14
+#elif defined PIC
        /* We cannot use the PLT, because it requires that %r12 be set, but
           we can't save and restore our caller's value.  Instead, we do an
           indirect jump through the GOT. */