diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/nptl/jmp-unwind.c | 12 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 10 |
3 files changed, 12 insertions, 17 deletions
@@ -1,3 +1,10 @@ +2015-09-18 H.J. Lu <hongjiu.lu@intel.com> + + * sysdeps/nptl/jmp-unwind.c: Include <libc-lock.h> instead of + <nptl/pthreadP.h>. + (_longjmp_unwind): Use __libc_ptf_call. + * sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise. + 2015-09-18 David Lamparter <equinox-gentoo@diac24.net> * sysdeps/arm/setjmp.S: Change PIC to SHARED. diff --git a/sysdeps/nptl/jmp-unwind.c b/sysdeps/nptl/jmp-unwind.c index 8e01986..2915989 100644 --- a/sysdeps/nptl/jmp-unwind.c +++ b/sysdeps/nptl/jmp-unwind.c @@ -18,7 +18,7 @@ #include <setjmp.h> #include <stddef.h> -#include <nptl/pthreadP.h> +#include <libc-lock.h> extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); #pragma weak __pthread_cleanup_upto @@ -27,12 +27,6 @@ extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); void _longjmp_unwind (jmp_buf env, int val) { -#ifdef SHARED - if (__libc_pthread_functions_init) - PTHFCT_CALL (ptr___pthread_cleanup_upto, (env->__jmpbuf, - CURRENT_STACK_FRAME)); -#else - if (__pthread_cleanup_upto != NULL) - __pthread_cleanup_upto (env->__jmpbuf, CURRENT_STACK_FRAME); -#endif + __libc_ptf_call (__pthread_cleanup_upto, (env->__jmpbuf, + CURRENT_STACK_FRAME), 0); } diff --git a/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c index 52fe101..4b8ad28 100644 --- a/sysdeps/unix/sysv/linux/s390/jmp-unwind.c +++ b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c @@ -18,7 +18,7 @@ #include <setjmp.h> #include <stddef.h> -#include <nptl/pthreadP.h> +#include <libc-lock.h> extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); #pragma weak __pthread_cleanup_upto @@ -29,11 +29,5 @@ _longjmp_unwind (jmp_buf env, int val) { char local_var; -#ifdef SHARED - if (__libc_pthread_functions_init) - PTHFCT_CALL (ptr___pthread_cleanup_upto, (env->__jmpbuf, &local_var)); -#else - if (__pthread_cleanup_upto != NULL) - __pthread_cleanup_upto (env->__jmpbuf, &local_var); -#endif + __libc_ptf_call (__pthread_cleanup_upto, (env->__jmpbuf, &local_var), 0); } |