diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-04 15:18:54 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-04 15:18:54 +0200 |
commit | 36043b37739dffdaea8d31457570810e492268d7 (patch) | |
tree | 0045cba85b862ecca89cf7b5aff336bddbabad89 /libc/sysdeps/linux/sparc/jmpbuf-unwind.h | |
parent | a5352e212fcd4da83c8ff4fe542ef23c8e3187f8 (diff) | |
parent | 6d550ddd129b18cf800eab604f74536754526cd8 (diff) |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'libc/sysdeps/linux/sparc/jmpbuf-unwind.h')
-rw-r--r-- | libc/sysdeps/linux/sparc/jmpbuf-unwind.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/libc/sysdeps/linux/sparc/jmpbuf-unwind.h b/libc/sysdeps/linux/sparc/jmpbuf-unwind.h index 40303f0cd..90efb7719 100644 --- a/libc/sysdeps/linux/sparc/jmpbuf-unwind.h +++ b/libc/sysdeps/linux/sparc/jmpbuf-unwind.h @@ -6,26 +6,19 @@ #include <setjmp.h> #include <jmpbuf-offsets.h> -#if __WORDSIZE == 64 - -/* Test if longjmp to JMPBUF would unwind the frame - containing a local variable at ADDRESS. */ -#define _JMPBUF_UNWINDS(jmpbuf, address) \ - ((unsigned long int) (address) < (jmpbuf)->uc_mcontext.mc_fp) - -#else - /* Test if longjmp to JMPBUF would unwind the frame containing a local variable at ADDRESS. */ #define _JMPBUF_UNWINDS(jmpbuf, address) \ ((int) (address) < (jmpbuf)[JB_SP]) -#endif - #ifdef __UCLIBC_HAS_THREADS_NATIVE__ -#if defined(__arch64__) -#include "sparc64/jmpbuf-unwind.h" -#else -#include "sparc32/jmpbuf-unwind.h" -#endif +#include <setjmp.h> +#include <stdint.h> +#include <unwind.h> + +#define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \ + _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj) + +#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ + ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj)) #endif |