From 8d5be89424e466635b8294b37226878c1a9fe1eb Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 6 Oct 2004 09:22:13 +0000 Subject: [PATCH] * sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h. (JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from CFA. --- nptl/ChangeLog | 6 ++++++ nptl/sysdeps/s390/jmpbuf-unwind.h | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 287e8b6b2a4..f48085822c2 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2004-10-06 Jakub Jelinek + + * 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 * 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 19d0729a947..9f7e1ad5839 100644 --- a/nptl/sysdeps/s390/jmpbuf-unwind.h +++ b/nptl/sysdeps/s390/jmpbuf-unwind.h @@ -20,13 +20,18 @@ #include #include #include +#include +/* 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) -- 2.47.2