htl: move pthread_testcancel into libc.

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

diff --git a/htl/Makefile b/htl/Makefile
index 0acd3a88683e79e822ce640db037d6905f20b217..ecfa3c1779f949af60257fde61b70cb2c3ac9cf8 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -32,7 +32,6 @@ libpthread-routines := \
   pt-initialize \
   pt-join \
   pt-spin-inlines \
-  pt-testcancel \
   pt-mutex-transfer-np \
   pt-hurd-cond-wait \
   pt-hurd-cond-timedwait \
@@ -204,6 +203,7 @@ routines := \
   pt-sigstate \
   pt-sigstate-destroy \
   pt-stack-alloc \
+  pt-testcancel \
   pt-thread-alloc \
   pt-thread-start \
   pt-thread-terminate \

diff --git a/htl/Versions b/htl/Versions
index 06977e677b2d285a46374cdc79c55ed5a304ad8c..0f2274591454aa901b807ac47eeffcf1e79fc5fe 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -93,6 +93,7 @@ libc {
     pthread_setschedprio;
     pthread_setspecific;
     pthread_sigmask;
+    pthread_testcancel;
     pthread_yield;
   }
 
@@ -201,6 +202,7 @@ libc {
     pthread_kill;
     pthread_setconcurrency;
     pthread_setschedprio;
+    pthread_testcancel;
     pthread_yield;
   }
 
@@ -255,6 +257,7 @@ libc {
     __pthread_sigstate_destroy;
     __pthread_sigmask;
     __pthread_stack_alloc;
+    __pthread_testcancel;
     __pthread_timedblock;
     __pthread_timedblock_intr;
     __pthread_thread_alloc;
@@ -296,8 +299,6 @@ libpthread {
 
     pthread_mutex_transfer_np;
 
-    pthread_testcancel;
-
     sem_close; sem_destroy; sem_getvalue; sem_init; sem_open; sem_post;
     sem_timedwait; sem_trywait; sem_unlink; sem_wait;
 

diff --git a/htl/pt-testcancel.c b/htl/pt-testcancel.c
index 4eef765f304d39e63e060139df414881ea4837a3..0332f6dd74266d71dd8682ff648205ecaa12a8c0 100644 (file)
--- a/htl/pt-testcancel.c
+++ b/htl/pt-testcancel.c
@@ -20,6 +20,7 @@
 
 #include <pt-internal.h>
 #include <pthreadP.h>
+#include <shlib-compat.h>
 
 void
 __pthread_testcancel (void)
@@ -34,4 +35,10 @@ __pthread_testcancel (void)
   if (cancelled)
     __pthread_exit (PTHREAD_CANCELED);
 }
-strong_alias (__pthread_testcancel, pthread_testcancel)
+
+libc_hidden_def (__pthread_testcancel)
+versioned_symbol (libc, __pthread_testcancel, pthread_testcancel, GLIBC_2_43);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_43)
+compat_symbol (libpthread, __pthread_testcancel, pthread_testcancel, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 1538fdee729ff08573287c1e4c6c7508a226f719..dd9d77776f5bd1179c1ef8c44957785333b220a5 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -212,6 +212,7 @@ libc_hidden_proto (__pthread_attr_setstack)
 int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *);
 libc_hidden_proto (__pthread_attr_getstack)
 void __pthread_testcancel (void);
+libc_hidden_proto (__pthread_testcancel)
 int __pthread_attr_init (pthread_attr_t *attr);
 int __pthread_condattr_init (pthread_condattr_t *attr);
 int __pthread_setconcurrency (int __new_level);

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 6056958fcd574358704d651e4f555b9822a1b58c..a676cd0f75df8dca31723aa76048cf923b3a7d1b 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -120,6 +120,7 @@ GLIBC_2.12 pthread_setschedparam F
 GLIBC_2.12 pthread_setschedprio F
 GLIBC_2.12 pthread_setspecific F
 GLIBC_2.12 pthread_sigmask F
+GLIBC_2.12 pthread_testcancel F
 GLIBC_2.12 pthread_yield F
 GLIBC_2.13 __fentry__ F
 GLIBC_2.14 syncfs F
@@ -2647,6 +2648,7 @@ GLIBC_2.43 pthread_getcpuclockid F
 GLIBC_2.43 pthread_kill F
 GLIBC_2.43 pthread_setconcurrency F
 GLIBC_2.43 pthread_setschedprio F
+GLIBC_2.43 pthread_testcancel F
 GLIBC_2.43 pthread_yield F
 GLIBC_2.5 __readlinkat_chk F
 GLIBC_2.5 inet6_opt_append F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index afb9e6064d055f1733bd5d37a2eb9172a4026ecc..044fb1c35530f1b32955cbfd8c12885476f81c86 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -30,7 +30,6 @@ GLIBC_2.12 pthread_spin_init F
 GLIBC_2.12 pthread_spin_lock F
 GLIBC_2.12 pthread_spin_trylock F
 GLIBC_2.12 pthread_spin_unlock F
-GLIBC_2.12 pthread_testcancel F
 GLIBC_2.12 sem_close F
 GLIBC_2.12 sem_destroy F
 GLIBC_2.12 sem_getvalue F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index b17e1980b513029f12a5fcb97b1ed6b7935a0af1..dff8eee881efd82bc770c3a6afba271ae711c23b 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1612,6 +1612,7 @@ GLIBC_2.38 pthread_setschedparam F
 GLIBC_2.38 pthread_setschedprio F
 GLIBC_2.38 pthread_setspecific F
 GLIBC_2.38 pthread_sigmask F
+GLIBC_2.38 pthread_testcancel F
 GLIBC_2.38 pthread_yield F
 GLIBC_2.38 ptrace F
 GLIBC_2.38 ptsname F
@@ -2329,6 +2330,7 @@ GLIBC_2.43 pthread_getcpuclockid F
 GLIBC_2.43 pthread_kill F
 GLIBC_2.43 pthread_setconcurrency F
 GLIBC_2.43 pthread_setschedprio F
+GLIBC_2.43 pthread_testcancel F
 GLIBC_2.43 pthread_yield F
 HURD_CTHREADS_0.3 __cthread_getspecific F
 HURD_CTHREADS_0.3 __cthread_keycreate F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index f1fef475ad379bd7eba8b3ce103b0850977e2c49..66f06f82b3198363d688902bdd04ae0306573bde 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -50,7 +50,6 @@ GLIBC_2.38 pthread_spin_init F
 GLIBC_2.38 pthread_spin_lock F
 GLIBC_2.38 pthread_spin_trylock F
 GLIBC_2.38 pthread_spin_unlock F
-GLIBC_2.38 pthread_testcancel F
 GLIBC_2.38 pthread_timedjoin_np F
 GLIBC_2.38 pthread_tryjoin_np F
 GLIBC_2.38 sem_clockwait F