From 7dfaf230d2191da71f3078943ea09d014298e7b0 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 16 Dec 2006 04:54:52 +0000 Subject: Merge from trunk. --- libpthread/linuxthreads.old/pthread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpthread/linuxthreads.old/pthread.c') 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); -- cgit v1.2.3