htl: Move __pthread_enable/disable_asynccancel into libc

This is actually needed before we make pthread_cancel available in libc.

diff --git a/htl/Makefile b/htl/Makefile
index 9fde4174bbb120699a38397ef05929f2e7fdc911..f841b33b5161b6bede65b2abca6259784ae29334 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -33,7 +33,6 @@ libpthread-routines := \
   pt-spin \
   pt-getname-np \
   pt-setname-np \
-  cancellation \
   # libpthread-routine
 
 headers := \
@@ -67,6 +66,7 @@ distribute :=
 
 routines := \
   alloca_cutoff \
+  cancellation \
   htlfreeres \
   pt-alloc \
   pt-attr \

diff --git a/htl/Versions b/htl/Versions
index 349ab4fe4bc2bdb67d1cf4226d53838265e40dbc..280459c2a68db899c1bfc1a82fba0d91bb59663d 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -265,6 +265,8 @@ libc {
     __pthread_dealloc;
     __pthread_dealloc_finish;
     __pthread_setcancelstate;
+    __pthread_enable_asynccancel;
+    __pthread_disable_asynccancel;
     __pthread_cond_broadcast;
     __pthread_cond_destroy;
     __pthread_cond_init;
@@ -345,7 +347,5 @@ libpthread {
     __pthread_initialize_minimal;
 
     __pthread_create;
-    __pthread_enable_asynccancel;
-    __pthread_disable_asynccancel;
   }
 }