diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-10-06 09:22:13 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-10-06 09:22:13 +0000 |
| commit | 8d5be89424e466635b8294b37226878c1a9fe1eb (patch) | |
| tree | cedf82c1cdf6ab664401e90b7e4241ade6bcc347 | |
| parent | 0caba1fbdb2bb0d78bbf3a9cf4d227ad1c1f8f86 (diff) | |
* sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h.
(JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from
CFA.
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/s390/jmpbuf-unwind.h | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 287e8b6b2a..f48085822c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +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-06 Ulrich Drepper <drepper@redhat.com> * tst-cancel4.c (tf_msgrcv): Check for failure in msgget. If the diff --git a/nptl/sysdeps/s390/jmpbuf-unwind.h b/nptl/sysdeps/s390/jmpbuf-unwind.h index 19d0729a94..9f7e1ad583 100644 --- 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) |