diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-10-06 17:40:56 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-10-06 17:40:56 +0000 |
| commit | 6bdd38ba719f92869fd7db62ad5d9368ad1b9e26 (patch) | |
| tree | b45e3b37707570cd9cd5873957ba48c0c5c778cf | |
| parent | 67060ef581a5e44ced1d08e654f8f63737c51c78 (diff) | |
| download | glibc-6bdd38ba719f92869fd7db62ad5d9368ad1b9e26.tar.gz glibc-6bdd38ba719f92869fd7db62ad5d9368ad1b9e26.tar.xz glibc-6bdd38ba719f92869fd7db62ad5d9368ad1b9e26.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/s390/jmpbuf-unwind.h | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 9bb8a43b91..952dfa3cd7 100644 --- 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 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) |