aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-01-14 00:52:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-01-14 00:52:51 +0000
commit0c487c150758d5baf8be5b8e4e33b8355e7adc36 (patch)
tree0df1824a6ea632c5ebd54dc7e197510731910b1f /toolchain
parent6db50138f5f63744be848d8296273406530457f8 (diff)
downloadupstream-0c487c150758d5baf8be5b8e4e33b8355e7adc36.tar.gz
upstream-0c487c150758d5baf8be5b8e4e33b8355e7adc36.tar.bz2
upstream-0c487c150758d5baf8be5b8e4e33b8355e7adc36.zip
work around problems with the libpthread onexit() handler
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14032 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/patches/200-libpthread_fix.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches/200-libpthread_fix.patch b/toolchain/uClibc/patches/200-libpthread_fix.patch
index 8acfa3f96f..148f608cd0 100644
--- a/toolchain/uClibc/patches/200-libpthread_fix.patch
+++ b/toolchain/uClibc/patches/200-libpthread_fix.patch
@@ -33,3 +33,24 @@
lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so
+--- a/libpthread/linuxthreads/pthread.c
++++ b/libpthread/linuxthreads/pthread.c
+@@ -32,6 +32,8 @@
+ #include "smp.h"
+ #include <not-cancel.h>
+
++#define HAVE_Z_NODELETE
++
+ /* Sanity check. */
+ #if !defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3
+ # error "This must not happen"
+@@ -976,7 +978,9 @@ static void pthread_onexit_process(int r
+ request.req_args.exit.code = retcode;
+ TEMP_FAILURE_RETRY(write_not_cancel(__pthread_manager_request,
+ (char *) &request, sizeof(request)));
++#ifdef notyet
+ suspend(self);
++#endif
+ /* Main thread should accumulate times for thread manager and its
+ children, so that timings for main thread account for all threads. */
+ if (self == __pthread_main_thread)