summary refs log tree commit diff
path: root/sysdeps/s390/s390-64/setjmp.S
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-01-02 20:57:43 +0000
committerUlrich Drepper <drepper@redhat.com>2006-01-02 20:57:43 +0000
commit305bb37e1e4d39fe9e515fc5543fefea7c4e9653 (patch)
treeb6ffe62a76de136c56c8c6ca43394bb48546a019 /sysdeps/s390/s390-64/setjmp.S
parentcc792128be8ee299212c43b1c34f4433e257a7e6 (diff)
downloadglibc-305bb37e1e4d39fe9e515fc5543fefea7c4e9653.tar.gz
glibc-305bb37e1e4d39fe9e515fc5543fefea7c4e9653.tar.xz
glibc-305bb37e1e4d39fe9e515fc5543fefea7c4e9653.zip
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (PTR_MANGLE, cvs/fedora-glibc-20060102T2114
	PTR_MANGLE2, PTR_DEMANGLE, PTR_DEMANGLE2): Define.
	* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h (PTR_MANGLE,
	PTR_MANGLE2, PTR_DEMANGLE, PTR_DEMANGLE2): Define.
	* sysdeps/unix/sysv/linux/sparc/bits/setjmp.h [__WORDSIZE == 64]
	(_JMPBUF_UNWINDS): Don't demangle uc_mcontext.mc_fp.
	* sysdeps/sparc/sparc32/setjmp.S (__sigsetjmp): Mangle %fp, %sp
	and %o7.
	* sysdeps/sparc/sparc32/__longjmp.S (__longjmp): Demangle %fp, %sp
	and %o7.

2006-01-02  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (PTR_MANGLE2):
	Define.
	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (PTR_MANGLE2):
	Likewise.
	* sysdeps/s390/s390-32/__longjmp.c (__longjmp): Demangle also %r15.
	* sysdeps/s390/s390-64/__longjmp.c (__longjmp): Likewise.
	* sysdeps/s390/s390-32/setjmp.S (__sigsetjmp): Mangle also %r15.
	* 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/s390/bits/setjmp.h (__jmp_buf): Add __s390_jmp_buf
	struct tag to make C++ happy.

2006-01-02  Ulrich Drepper  <drepper@redhat.com>

	* posix/Makefile ($(objpfx)annexc.out): Move -I.. to the end of
	the include list.
Diffstat (limited to 'sysdeps/s390/s390-64/setjmp.S')
-rw-r--r--sysdeps/s390/s390-64/setjmp.S7
1 files changed, 4 insertions, 3 deletions
diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp.S
index 25d97b6a6a..a962db46ce 100644
--- a/sysdeps/s390/s390-64/setjmp.S
+++ b/sysdeps/s390/s390-64/setjmp.S
@@ -31,9 +31,10 @@ ENTRY(__sigsetjmp)
 #ifdef PTR_MANGLE
 	stmg   %r6,%r13,0(%r2)      /* Store registers in jmp_buf.  */
 	lgr    %r4,%r14
-	PTR_MANGLE (%r4, %r5)
-	stg    %r4,64(%r2)
-	stg    %r15,72(%r2)
+	lgr    %r5,%r15
+	PTR_MANGLE (%r4, %r1)
+	PTR_MANGLE2 (%r5, %r1)
+	stmg   %r4,%r5,64(%r2)
 #else
         stmg   %r6,%r15,0(%r2)      /* Store registers in jmp_buf.  */
 #endif