Update.

2004-10-06  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h.
	(JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from CFA.

diff --git a/ChangeLog b/ChangeLog
index 9bb8a43b91c270ffa13e60634075cf0398619760..952dfa3cd7f75c0c0d0fce7c74ec3671234e74bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-06  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h.
+       (JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from CFA.
+
 2004-10-05  Ulrich Drepper  <drepper@redhat.com>
 
        * elf/rtld.c (dl_main): Use _dl_debug_printf instead of _dl_printf

diff --git a/nptl/sysdeps/s390/jmpbuf-unwind.h b/nptl/sysdeps/s390/jmpbuf-unwind.h
index 19d0729a947add412367f5df3035b24c7edf2072..9f7e1ad5839130886a885f4ce1c7d6ae9ba70ea3 100644 (file)
--- a/nptl/sysdeps/s390/jmpbuf-unwind.h
+++ b/nptl/sysdeps/s390/jmpbuf-unwind.h
@@ -20,13 +20,18 @@
 #include <setjmp.h>
 #include <stdint.h>
 #include <unwind.h>
+#include <bits/wordsize.h>
 
+/* On s390{,x}, CFA is always 96 (resp. 160) bytes above actual
+   %r15.  */
 #define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
-  _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
+  _JMPBUF_UNWINDS_ADJ (_jmpbuf,                                        \
+                      (void *) (_Unwind_GetCFA (_context)      \
+                                - 32 - 2 * __WORDSIZE), _adj)
 
-#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj)    \
-  ((uintptr_t) (_address) - (_adj)                      \
+#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj)           \
+  ((uintptr_t) (_address) - (_adj)                             \
    < (uintptr_t) (_jmpbuf)->__gregs[__JB_GPR15] - (_adj))
 
-/* We use the normal lobngjmp for unwinding.  */
+/* We use the normal longjmp for unwinding.  */
 #define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val)