diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-12-20 07:21:59 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-12-20 07:21:59 +0000 |
| commit | 00c2b3b91dc5f11924006ed4fb69d9d7442749b7 (patch) | |
| tree | c367b0b7c66ba48cde11d2bd7bfe9c63e7b3ad49 /sysdeps/s390/s390-32/setjmp.S | |
| parent | fc3480d3eea6380ea00d150d87830dc3cb86ede8 (diff) | |
| download | glibc-00c2b3b91dc5f11924006ed4fb69d9d7442749b7.zip glibc-00c2b3b91dc5f11924006ed4fb69d9d7442749b7.tar.gz glibc-00c2b3b91dc5f11924006ed4fb69d9d7442749b7.tar.bz2 | |
[BZ #1978]
2005-12-16 Thorsten Kukuk <kukuk@suse.de>
[BZ #1978]
* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
Map more filesystem types to a string.
* sysdeps/unix/sysv/linux/linux_fsinfo.h: Add SYSFS_MAGIC.
2005-12-19 Jakub Jelinek <jakub@redhat.com>
* locale/Makefile (programs/%-kw.h): Run $(GPERF) inside of the
programs subdirectory.
* sysdeps/powerpc/powerpc32/__longjmp-common.S (__longjmp): Use
PTR_DEMANGLE for PC if defined.
* sysdeps/powerpc/powerpc64/__longjmp-common.S (__longjmp):
Likewise.
* sysdeps/unix/sysv/linux/ia64/__longjmp.S (__longjmp): Likewise.
* sysdeps/s390/s390-32/__longjmp.c (__longjmp): Xor %r14 with
THREAD_GET_POINTER_GUARD () if PTR_DEMANGLE is defined.
* sysdeps/s390/s390-64/__longjmp.c (__longjmp): Likewise.
* sysdeps/powerpc/powerpc32/setjmp-common.S (__sigsetjmp): Use
PTR_MANGLE for PC if defined.
* sysdeps/powerpc/powerpc64/setjmp-common.S (__sigsetjmp): Likewise.
* sysdeps/s390/s390-32/setjmp.S (__sigsetjmp): Likewise.
Avoid call to __sigjmp_save if IS_IN_rtld.
* sysdeps/s390/s390-32/elf/setjmp.S (__sigsetjmp): Likewise.
* sysdeps/s390/s390-64/setjmp.S (__sigsetjmp): Likewise.
* sysdeps/s390/s390-64/elf/setjmp.S (__sigsetjmp): Likewise.
* sysdeps/unix/sysv/linux/ia64/setjmp.S (__sigsetjmp): Likewise.
* sysdeps/unix/sysv/linux/ia64/sysdep.h (PTR_MANGLE, PTR_DEMANGLE):
Define.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Include tls.h.
(PTR_MANGLE, PTR_DEMANGLE): Define.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Include tls.h
(PTR_MANGLE, PTR_DEMANGLE): Define.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Include tls.h.
(PTR_MANGLE, PTR_DEMANGLE): Define.
(SYSCALL_ERROR_HANDLER): Add missing semicolons.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Include tls.h.
(PTR_MANGLE, PTR_DEMANGLE): Define.
* sysdeps/unix/sysv/linux/s390/s390-64/socket.S (__socket): Add
SYSCALL_ERROR_HANDLER.
2005-12-19 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Handle NO_WEAK_ALIAS.
* sysdeps/unix/sysv/linux/sparc/sparc64/socket.S: Likewise.
Patch by Clint Adams.
2005-12-16 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/sys/user.h: Copy struct user and
dependent definitions from the kernel header to sys/user.h and
remove the #include of asm/user.h.
Diffstat (limited to 'sysdeps/s390/s390-32/setjmp.S')
| -rw-r--r-- | sysdeps/s390/s390-32/setjmp.S | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S index dc4862b..a438595 100644 --- a/sysdeps/s390/s390-32/setjmp.S +++ b/sysdeps/s390/s390-32/setjmp.S @@ -1,5 +1,5 @@ /* - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -29,10 +29,22 @@ /* R2 = pointer to jmp_buf, R3 = savemask */ ENTRY(__sigsetjmp) +#ifdef PTR_MANGLE + stm %r6,%r13,0(%r2) /* store registers in jmp_buf */ + lr %r4,%r14 + PTR_MANGLE (%r4, %r5) + st %r4,32(%r2) + st %r15,36(%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. */ |