X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fcancellation.c;h=b02cdfb093cc528413cc79f1384f19418335b0d6;hb=26120950e26478740a29fd0b1fd78a0bd6b880c8;hp=e35ba8245d2e38b277b8214939cf003f895a4fa6;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index e35ba824..b02cdfb0 100644
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -1,22 +1,23 @@
 #include "pthread_impl.h"
 
-void __pthread_register_cancel(struct __ptcb *cb)
+static void dummy(struct __ptcb *cb)
 {
-	struct pthread *self = pthread_self();
-	cb->__next = self->cancelbuf;
-	self->cancelbuf = cb;
 }
+weak_alias(dummy, __pthread_do_unwind);
+weak_alias(dummy, __pthread_do_register);
+weak_alias(dummy, __pthread_do_unregister);
 
-#define pthread_self __pthread_self
+void __pthread_unwind_next(struct __ptcb *cb)
+{
+	__pthread_do_unwind(cb);
+}
 
-void __pthread_unregister_cancel(struct __ptcb *cb)
+void __pthread_register_cancel(struct __ptcb *cb)
 {
-	struct pthread *self = pthread_self();
-	self->cancelbuf = self->cancelbuf->__next;
+	__pthread_do_register(cb);
 }
 
-void __pthread_unwind_next(struct __ptcb *cb)
+void __pthread_unregister_cancel(struct __ptcb *cb)
 {
-	if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
-	pthread_exit(PTHREAD_CANCELLED);
+	__pthread_do_unregister(cb);
 }