From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 16 Nov 2025 15:40:19 +0000 (+0000)
Subject: htl: Move __pthread_enable/disable_asynccancel into libc
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f63dd924312919667f8c71f7701523dfdc542067;p=thirdparty%2Fglibc.git

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 9fde4174bb..f841b33b51 100644
--- 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 349ab4fe4b..280459c2a6 100644
--- 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;
   }
 }