From: Rich Felker <dalias@aerifal.cx>
Date: Fri, 10 Feb 2012 02:24:56 +0000 (-0500)
Subject: small fix for new pthread cleanup stuff
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=2230218c283af7fbff08167685f17dad8d748f14

small fix for new pthread cleanup stuff

even if pthread_create/exit code is not linked, run flag needs to be
checked and cleanup function potentially run on pop. thus, move the
code to the module that's always linked when pthread_cleanup_push/pop
is used.
---

diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index 967705a9..23d23d14 100644
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -11,6 +11,7 @@ void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 void _pthread_cleanup_pop(struct __ptcb *cb, int run)
 {
 	__do_cleanup_pop(cb, run);
+	if (run) cb->__f(cb->__x);
 }
 
 static void dummy()
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 87bf8166..d84e50a9 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -55,7 +55,6 @@ void __do_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 void __do_cleanup_pop(struct __ptcb *cb, int run)
 {
 	__pthread_self()->cancelbuf = cb->__next;
-	if (run) cb->__f(cb->__x);
 }
 
 static int start(void *p)