From 8f86b8a1977128e2795737fed2577b377cc2b15e Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sun, 13 Mar 2011 20:10:13 +0100 Subject: move *longjmp related prototypes to setjmp.h Provide common prototypes for __longjmp, __libc_longjmp, __libc_siglongjmp _longjmp_unwind, __libc_unwind_longjmp in setjmp.h in preparation for use in LT new Add __longjmp to h8300 and i960 Make common longjmp.c good for NPTL Guard _longjmp_unwind use in sh's longjmp.c for NPTL (I think sh could use the common one) Remove unneeded attribute_noreturn, prototype provides it already Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libpthread/linuxthreads.old/ptlongjmp.c | 9 ++------- libpthread/linuxthreads/sysdeps/pthread/ptlongjmp.c | 7 ------- libpthread/nptl/sysdeps/alpha/jmpbuf-unwind.h | 3 --- libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h | 3 --- libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h | 4 ---- libpthread/nptl/sysdeps/mips/jmpbuf-unwind.h | 3 --- libpthread/nptl/sysdeps/powerpc/jmpbuf-unwind.h | 3 --- libpthread/nptl/sysdeps/sh/jmpbuf-unwind.h | 5 ----- libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h | 4 ---- libpthread/nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h | 3 --- libpthread/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c | 1 - libpthread/nptl/sysdeps/x86_64/jmpbuf-unwind.h | 3 --- 12 files changed, 2 insertions(+), 46 deletions(-) (limited to 'libpthread') diff --git a/libpthread/linuxthreads.old/ptlongjmp.c b/libpthread/linuxthreads.old/ptlongjmp.c index 5213a4de0..c01b9194b 100644 --- a/libpthread/linuxthreads.old/ptlongjmp.c +++ b/libpthread/linuxthreads.old/ptlongjmp.c @@ -20,11 +20,6 @@ #include "internals.h" #include -/* These functions are not declared anywhere since they shouldn't be - used at another place but here. */ -extern __typeof(siglongjmp) __libc_siglongjmp attribute_noreturn; -extern __typeof(longjmp) __libc_longjmp attribute_noreturn; - static void pthread_cleanup_upto(__jmp_buf target) { pthread_descr self = thread_self(); @@ -58,13 +53,13 @@ static void pthread_cleanup_upto(__jmp_buf target) THREAD_SETMEM(self, p_in_sighandler, NULL); } -void attribute_noreturn siglongjmp(sigjmp_buf env, int val) +void siglongjmp(sigjmp_buf env, int val) { pthread_cleanup_upto(env->__jmpbuf); __libc_siglongjmp(env, val); } -void attribute_noreturn longjmp(jmp_buf env, int val) +void longjmp(jmp_buf env, int val) { pthread_cleanup_upto(env->__jmpbuf); __libc_longjmp(env, val); diff --git a/libpthread/linuxthreads/sysdeps/pthread/ptlongjmp.c b/libpthread/linuxthreads/sysdeps/pthread/ptlongjmp.c index a2a56b8d9..ee5522036 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/ptlongjmp.c +++ b/libpthread/linuxthreads/sysdeps/pthread/ptlongjmp.c @@ -19,13 +19,6 @@ #include "pthread.h" #include "internals.h" -/* These functions are not declared anywhere since they shouldn't be - used at another place but here. */ -extern void __libc_siglongjmp (sigjmp_buf env, int val) - __attribute__ ((noreturn)); -extern void __libc_longjmp (sigjmp_buf env, int val) - __attribute__ ((noreturn)); - #ifdef SHARED void siglongjmp (sigjmp_buf env, int val) { diff --git a/libpthread/nptl/sysdeps/alpha/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/alpha/jmpbuf-unwind.h index 5cef8b1cf..5ef2f6167 100644 --- a/libpthread/nptl/sysdeps/alpha/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/alpha/jmpbuf-unwind.h @@ -26,6 +26,3 @@ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj)) - -/* We use the normal lobngjmp for unwinding. */ -#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h index 6e8f01d10..6251c0040 100644 --- a/libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/arm/jmpbuf-unwind.h @@ -31,6 +31,3 @@ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[__JMP_BUF_SP] - (_adj)) - -/* We use the normal longjmp for unwinding. */ -#define __libc_unwind_longjmp(buf, val) longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h index b9528f363..5ef2f6167 100644 --- a/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/i386/jmpbuf-unwind.h @@ -26,7 +26,3 @@ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj)) - -/* We use the normal lobngjmp for unwinding. */ -extern __typeof(longjmp) __libc_longjmp attribute_noreturn; -#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/mips/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/mips/jmpbuf-unwind.h index a9cfe43b3..788920a9f 100644 --- a/libpthread/nptl/sysdeps/mips/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/mips/jmpbuf-unwind.h @@ -25,6 +25,3 @@ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[0].__sp - (_adj)) - -/* We use the normal longjmp for unwinding. */ -#define __libc_unwind_longjmp(buf, val) longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/powerpc/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/powerpc/jmpbuf-unwind.h index 0b817160d..59ae02c0c 100644 --- a/libpthread/nptl/sysdeps/powerpc/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/powerpc/jmpbuf-unwind.h @@ -26,6 +26,3 @@ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_GPR1] - (_adj)) - -/* We use the normal lobngjmp for unwinding. */ -#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/sh/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/sh/jmpbuf-unwind.h index 41c3c3984..116d21442 100644 --- a/libpthread/nptl/sysdeps/sh/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/sh/jmpbuf-unwind.h @@ -26,8 +26,3 @@ #define _JMPBUF_UNWINDS_ADJ(jmpbuf, address, adj) \ ((uintptr_t) (address) - (adj) < (uintptr_t) (jmpbuf)[0].__regs[7] - (adj)) - -extern __typeof(longjmp) __libc_longjmp attribute_noreturn; - -/* We use the normal lobngjmp for unwinding. */ -#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h index 71a358209..5ef2f6167 100644 --- a/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/sparc/sparc32/jmpbuf-unwind.h @@ -26,7 +26,3 @@ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj)) - -/* We use the normal longjmp for unwinding. */ -extern __typeof(longjmp) __libc_longjmp attribute_noreturn; -#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h index 5cef8b1cf..5ef2f6167 100644 --- a/libpthread/nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h @@ -26,6 +26,3 @@ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_SP] - (_adj)) - -/* We use the normal lobngjmp for unwinding. */ -#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c b/libpthread/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c index 642198bad..f2795510a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c @@ -25,7 +25,6 @@ extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); #pragma weak __pthread_cleanup_upto -void _longjmp_unwind (jmp_buf env, int val); void _longjmp_unwind (jmp_buf env, int val) { diff --git a/libpthread/nptl/sysdeps/x86_64/jmpbuf-unwind.h b/libpthread/nptl/sysdeps/x86_64/jmpbuf-unwind.h index 345ed557c..2c861c62d 100644 --- a/libpthread/nptl/sysdeps/x86_64/jmpbuf-unwind.h +++ b/libpthread/nptl/sysdeps/x86_64/jmpbuf-unwind.h @@ -26,6 +26,3 @@ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ ((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[JB_RSP] - (_adj)) - -/* We use the normal lobngjmp for unwinding. */ -#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) -- cgit v1.2.3