diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/cancel.c | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index bcd5ea1b00..adfaaa8f0e 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2003-02-21 Roland McGrath <roland@redhat.com> + + * cancel.c (__pthread_perform_cleanup): Call __libc_thread_freeres + instead of __rpc_thread_destroy. + 2003-02-21 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S (__vfork): Call diff --git a/linuxthreads/cancel.c b/linuxthreads/cancel.c index 838f55d8b2..d8053ca899 100644 --- a/linuxthreads/cancel.c +++ b/linuxthreads/cancel.c @@ -15,7 +15,7 @@ /* Thread cancellation */ #include <errno.h> -#include <rpc/rpc.h> +#include <libc-internal.h> #include "pthread.h" #include "internals.h" #include "spinlock.h" @@ -230,11 +230,5 @@ void __pthread_perform_cleanup(char *currentframe) } /* And the TSD which needs special help. */ -#if !(USE_TLS && HAVE___THREAD) - if (THREAD_GETMEM(self, p_libc_specific[_LIBC_TSD_KEY_RPC_VARS]) != NULL) - __rpc_thread_destroy (); -#else - if (__libc_tsd_get (RPC_VARS) != NULL) - __rpc_thread_destroy (); -#endif + __libc_thread_freeres (); } |