further debloat cancellation handlers

[musl] / src / thread / cancellation.c

diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index 6dfee53..b02cdfb 100644 (file)
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -1,18 +1,11 @@
 #include "pthread_impl.h"
 
-#ifdef __pthread_register_cancel
-#undef __pthread_register_cancel
-#undef __pthread_unregister_cancel
-#undef __pthread_unwind_next
-#define __pthread_register_cancel __pthread_register_cancel_3
-#define __pthread_unregister_cancel __pthread_unregister_cancel_3
-#define __pthread_unwind_next __pthread_unwind_next_3
-#endif
-
 static void dummy(struct __ptcb *cb)
 {
 }
 weak_alias(dummy, __pthread_do_unwind);
+weak_alias(dummy, __pthread_do_register);
+weak_alias(dummy, __pthread_do_unregister);
 
 void __pthread_unwind_next(struct __ptcb *cb)
 {
@@ -21,13 +14,10 @@ void __pthread_unwind_next(struct __ptcb *cb)
 
 void __pthread_register_cancel(struct __ptcb *cb)
 {
-       struct pthread *self = pthread_self();
-       cb->__next = self->cancelbuf;
-       self->cancelbuf = cb;
+       __pthread_do_register(cb);
 }
 
 void __pthread_unregister_cancel(struct __ptcb *cb)
 {
-       struct pthread *self = __pthread_self();
-       self->cancelbuf = self->cancelbuf->__next;
+       __pthread_do_unregister(cb);
 }