From a6a478e9f927835469cd1b770f395df640966c49 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 20 Mar 2000 07:07:18 +0000 Subject: Update. * include/stdlib.h: Add prototype for __cxa_atexit. --- linuxthreads/pthread.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'linuxthreads/pthread.c') diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index 5884b9b460..57bc15e512 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -308,6 +308,8 @@ __libc_allocate_rtsig (int high) static void pthread_initialize(void) __attribute__((constructor)); +extern void *__dso_handle __attribute__ ((weak)); + static void pthread_initialize(void) { struct sigaction sa; @@ -387,7 +389,13 @@ static void pthread_initialize(void) /* Register an exit function to kill all other threads. */ /* Do it early so that user-registered atexit functions are called before pthread_exit_process. */ - __on_exit(pthread_exit_process, NULL); + if (__dso_handle) + /* The cast is a bit unclean. The function expects two arguments but + we can only pass one. Fortunately this is not a problem since the + second argument of `pthread_exit_process' is simply ignored. */ + __cxa_atexit((void (*) (void *)) pthread_exit_process, NULL, __dso_handle); + else + on_exit (pthread_exit_process, NULL); } void __pthread_initialize(void) -- cgit v1.2.3