htl: move pthread_cancel, __pthread_do_cancel into libc.

Message-ID: <20250815181500.107433-10-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 88f65c419ad7a942c9fab3f93890685ac8eca13b..3ec68aa8425b1d5f39fd54e58fc799804dddbf4e 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -33,12 +33,10 @@ libpthread-routines := \
   pt-join \
   pt-spin-inlines \
   pt-testcancel \
-  pt-cancel \
   pt-mutex-transfer-np \
   pt-hurd-cond-wait \
   pt-hurd-cond-timedwait \
   pt-startup \
-  pt-docancel \
   pt-sysdep \
   pt-setup \
   pt-spin \
@@ -130,6 +128,7 @@ routines := \
   pt-barrierattr-setpshared \
   pt-block \
   pt-block-intr \
+  pt-cancel \
   pt-cleanup \
   pt-cond \
   pt-cond-brdcast \
@@ -146,6 +145,7 @@ routines := \
   pt-condattr-setpshared \
   pt-dealloc \
   pt-destroy-specific \
+  pt-docancel \
   pt-getconcurrency \
   pt-getcpuclockid \
   pt-getschedparam \

diff --git a/htl/Versions b/htl/Versions
index e5ff9186aa016e0fe85d8f15edae51c0422b9cee..078aa8b33a12de96f368f800b7f72512af1ec661 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -37,6 +37,7 @@ libc {
     pthread_barrierattr_getpshared;
     pthread_barrierattr_init;
     pthread_barrierattr_setpshared;
+    pthread_cancel;
     pthread_cond_broadcast;
     pthread_cond_destroy;
     pthread_cond_init;
@@ -192,6 +193,7 @@ libc {
   }
 
   GLIBC_2.43 {
+    pthread_cancel;
     pthread_getconcurrency;
     pthread_getcpuclockid;
     pthread_setconcurrency;
@@ -283,8 +285,6 @@ libpthread {
 
     pthread_atfork;
 
-    pthread_cancel;
-
     pthread_create; pthread_detach; pthread_exit;
 
     pthread_getattr_np;

diff --git a/htl/pt-cancel.c b/htl/pt-cancel.c
index b4f3a8b7e4498e6810102715bd9b60e50bcb8034..0005284fa88299d4cff9703b8799f5668f792695 100644 (file)
--- a/htl/pt-cancel.c
+++ b/htl/pt-cancel.c
@@ -19,9 +19,11 @@
 #include <pthread.h>
 
 #include <pt-internal.h>
+#include <shlib-compat.h>
+#include <ldsodefs.h>
 
 int
-pthread_cancel (pthread_t t)
+__pthread_cancel (pthread_t t)
 {
   int err = 0;
   struct __pthread *p;
@@ -60,3 +62,8 @@ pthread_cancel (pthread_t t)
 
   return err;
 }
+versioned_symbol (libc, __pthread_cancel, pthread_cancel, GLIBC_2_43);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
+compat_symbol (libpthread, __pthread_cancel, pthread_cancel, GLIBC_2_12);
+#endif

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 20cff5f14336b0877c8080d6dfa2504d28e8ca16..1128ca24969354ff813d20ad48836a3f6ee5d543 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -58,6 +58,7 @@ GLIBC_2.12 pthread_barrierattr_destroy F
 GLIBC_2.12 pthread_barrierattr_getpshared F
 GLIBC_2.12 pthread_barrierattr_init F
 GLIBC_2.12 pthread_barrierattr_setpshared F
+GLIBC_2.12 pthread_cancel F
 GLIBC_2.12 pthread_cond_broadcast F
 GLIBC_2.12 pthread_cond_destroy F
 GLIBC_2.12 pthread_cond_init F
@@ -2638,6 +2639,7 @@ GLIBC_2.42 uabs F
 GLIBC_2.42 uimaxabs F
 GLIBC_2.42 ulabs F
 GLIBC_2.42 ullabs F
+GLIBC_2.43 pthread_cancel F
 GLIBC_2.43 pthread_getconcurrency F
 GLIBC_2.43 pthread_getcpuclockid F
 GLIBC_2.43 pthread_setconcurrency F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index b3afc039e5e1727dbdab46e547934191c898a2c3..3c7c8d939866ecc0956ce8166b9cdd3d9a675f33 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -20,7 +20,6 @@ GLIBC_2.12 flockfile F
 GLIBC_2.12 ftrylockfile F
 GLIBC_2.12 funlockfile F
 GLIBC_2.12 pthread_atfork F
-GLIBC_2.12 pthread_cancel F
 GLIBC_2.12 pthread_create F
 GLIBC_2.12 pthread_detach F
 GLIBC_2.12 pthread_exit F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 88d180fcf26e3ef10cfc2101b2a2046110b986ca..8b5d0c8871c30c505c4ef622256bc1a5a01919c8 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1539,6 +1539,7 @@ GLIBC_2.38 pthread_barrierattr_destroy F
 GLIBC_2.38 pthread_barrierattr_getpshared F
 GLIBC_2.38 pthread_barrierattr_init F
 GLIBC_2.38 pthread_barrierattr_setpshared F
+GLIBC_2.38 pthread_cancel F
 GLIBC_2.38 pthread_cond_broadcast F
 GLIBC_2.38 pthread_cond_clockwait F
 GLIBC_2.38 pthread_cond_destroy F
@@ -2320,6 +2321,7 @@ GLIBC_2.42 uabs F
 GLIBC_2.42 uimaxabs F
 GLIBC_2.42 ulabs F
 GLIBC_2.42 ullabs F
+GLIBC_2.43 pthread_cancel F
 GLIBC_2.43 pthread_getconcurrency F
 GLIBC_2.43 pthread_getcpuclockid F
 GLIBC_2.43 pthread_setconcurrency F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index e76c359b1d802ccdf777229809c6a0634b71a80f..f8d7ee6bfde45bdf90cd54a43934dc7802a15da4 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -37,7 +37,6 @@ GLIBC_2.38 mtx_lock F
 GLIBC_2.38 mtx_timedlock F
 GLIBC_2.38 mtx_trylock F
 GLIBC_2.38 mtx_unlock F
-GLIBC_2.38 pthread_cancel F
 GLIBC_2.38 pthread_clockjoin_np F
 GLIBC_2.38 pthread_create F
 GLIBC_2.38 pthread_detach F