summaryrefslogtreecommitdiffstats
path: root/libpthread/linuxthreads.old/pthread.c
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2006-12-16 04:54:52 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2006-12-16 04:54:52 +0000
commit7dfaf230d2191da71f3078943ea09d014298e7b0 (patch)
tree11b16e846adf904f804b8ce15937db12d08259d8 /libpthread/linuxthreads.old/pthread.c
parent1bcf527f5f8c94aac1b2e80b585898a7266293af (diff)
downloaduClibc-alpine-7dfaf230d2191da71f3078943ea09d014298e7b0.tar.bz2
uClibc-alpine-7dfaf230d2191da71f3078943ea09d014298e7b0.tar.xz
Merge from trunk.
Diffstat (limited to 'libpthread/linuxthreads.old/pthread.c')
-rw-r--r--libpthread/linuxthreads.old/pthread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpthread/linuxthreads.old/pthread.c b/libpthread/linuxthreads.old/pthread.c
index d9adfa432..2efb4d2d4 100644
--- a/libpthread/linuxthreads.old/pthread.c
+++ b/libpthread/linuxthreads.old/pthread.c
@@ -819,7 +819,7 @@ static void pthread_handle_sigcancel(int sig)
if (__builtin_expect (THREAD_GETMEM(self, p_canceled), 0)
&& THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) {
if (THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS)
- pthread_exit(PTHREAD_CANCELED);
+ __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
jmpbuf = THREAD_GETMEM(self, p_cancel_jmp);
if (jmpbuf != NULL) {
THREAD_SETMEM(self, p_cancel_jmp, NULL);