X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_create.c;h=d058a1adec82b132483baf37a5a340ed787249cb;hp=6f1bb0e8172b3c8045b4fa0867071c3118dd1e6c;hb=f01d35184291c650f6a38f8b3da41693bfde0e70;hpb=06baa2b56cc64ec974f0dc6e67001d0cfa030826

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 6f1bb0e8..d058a1ad 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -4,6 +4,7 @@ static void dummy_1(pthread_t self)
 {
 }
 weak_alias(dummy_1, __pthread_tsd_run_dtors);
+weak_alias(dummy_1, __sigtimer_handler);
 
 #ifdef __pthread_unwind_next
 #undef __pthread_unwind_next
@@ -47,13 +48,9 @@ static void docancel(struct pthread *self)
 static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 {
 	struct pthread *self = __pthread_self();
-	if (!self->cancel) {
-		if (si->si_code == SI_TIMER && libc.sigtimer)
-			libc.sigtimer(sig, si, ctx);
-		return;
-	}
-	if (self->canceldisable) return;
-	if (self->cancelasync || (self->cancelpoint==1 && PC_AT_SYS(ctx)))
+	if (si->si_code == SI_TIMER) __sigtimer_handler(self);
+	if (self->cancel && !self->canceldisable &&
+	    (self->cancelasync || (self->cancelpoint==1 && PC_AT_SYS(ctx))))
 		docancel(self);
 }