htl: move pthread_barrier_destroy into libc.

Message-ID: <20250209200108.865599-6-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 6194bf87b0d8adda304446063fc767d3a7d80833..aa550109b6df5d415f69ece5f607f65c87ea900d 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -25,7 +25,6 @@ SYSDEPS := lockfile
 LCLHDRS :=
 
 libpthread-routines := \
-  pt-barrier-destroy \
   pt-barrier-init \
   pt-barrier-wait \
   pt-destroy-specific \
@@ -157,6 +156,7 @@ routines := \
   pt-attr-setstackaddr \
   pt-attr-setstacksize \
   pt-barrier \
+  pt-barrier-destroy \
   pt-barrierattr-destroy \
   pt-barrierattr-getpshared \
   pt-barrierattr-init \

diff --git a/htl/Versions b/htl/Versions
index cf8f86d764c9ea130398bdf5c5e1632bae8c3e33..c464d8eb53ca0da27956d3eda89fb3a03633f461 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -26,6 +26,7 @@ libc {
     pthread_attr_setscope;
     pthread_attr_setschedparam;
     pthread_attr_init;
+    pthread_barrier_destroy;
     pthread_barrierattr_destroy;
     pthread_barrierattr_getpshared;
     pthread_barrierattr_init;
@@ -128,6 +129,7 @@ libc {
   }
 
   GLIBC_2.42 {
+    pthread_barrier_destroy;
     pthread_barrierattr_destroy;
     pthread_barrierattr_getpshared;
     pthread_barrierattr_init;
@@ -210,7 +212,7 @@ libpthread {
 
     pthread_atfork;
 
-    pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait;
+    pthread_barrier_init; pthread_barrier_wait;
 
     pthread_cancel;
 

diff --git a/sysdeps/htl/pt-barrier-destroy.c b/sysdeps/htl/pt-barrier-destroy.c
index c480875ed2b78ff2c2d9e5e8dc8bed01f163bf34..e7ff7030f853d999bf4b0d1b255d2e8a5e77bdfc 100644 (file)
--- a/sysdeps/htl/pt-barrier-destroy.c
+++ b/sysdeps/htl/pt-barrier-destroy.c
@@ -18,9 +18,16 @@
 
 #include <pthread.h>
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 int
-pthread_barrier_destroy (pthread_barrier_t *barrier)
+__pthread_barrier_destroy (pthread_barrier_t *barrier)
 {
   return 0;
 }
+libc_hidden_def (__pthread_barrier_destroy)
+versioned_symbol (libc, __pthread_barrier_destroy, pthread_barrier_destroy, GLIBC_2_42);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_barrier_destroy, pthread_barrier_destroy, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index ae6a0cc7a6b4d8093b3d6433dc17f14fc98b9655..548adbe4afe9a6a1f1e5964aa44817bf61e39691 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -31,6 +31,8 @@ extern void __pthread_init_static_tls (struct link_map *) attribute_hidden;
 
 /* These represent the interface used by glibc itself.  */
 
+extern int __pthread_barrier_destroy (pthread_barrier_t *__barrier);
+libc_hidden_proto (__pthread_barrier_destroy)
 extern int __pthread_barrierattr_destroy (pthread_barrierattr_t *__attr);
 libc_hidden_proto (__pthread_barrierattr_destroy)
 extern int __pthread_barrierattr_getpshared (const pthread_barrierattr_t *__attr,

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index dc8627667f4306d4791c614f6f91604dd6d42ea4..91fc92a5aacd79097d607c4a3bc92ae2d7789290 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -49,6 +49,7 @@ GLIBC_2.12 pthread_attr_setscope F
 GLIBC_2.12 pthread_attr_setstack F
 GLIBC_2.12 pthread_attr_setstackaddr F
 GLIBC_2.12 pthread_attr_setstacksize F
+GLIBC_2.12 pthread_barrier_destroy F
 GLIBC_2.12 pthread_barrierattr_destroy F
 GLIBC_2.12 pthread_barrierattr_getpshared F
 GLIBC_2.12 pthread_barrierattr_init F
@@ -2565,6 +2566,7 @@ GLIBC_2.41 pthread_mutexattr_setrobust F
 GLIBC_2.41 pthread_mutexattr_setrobust_np F
 GLIBC_2.41 pthread_mutexattr_settype F
 GLIBC_2.41 pthread_sigmask F
+GLIBC_2.42 pthread_barrier_destroy F
 GLIBC_2.42 pthread_barrierattr_destroy F
 GLIBC_2.42 pthread_barrierattr_getpshared F
 GLIBC_2.42 pthread_barrierattr_init F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 65fcf5e43593a61d82dd737bc43f01023599d54f..c779be25ba5a9a9e5b92a7573dc61c96315431e4 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -22,7 +22,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_barrier_destroy F
 GLIBC_2.12 pthread_barrier_init F
 GLIBC_2.12 pthread_barrier_wait F
 GLIBC_2.12 pthread_cancel F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 8129eaf96cfe6aad184998bf252d3e1501d9ff65..db01e3c58d9ed089f6e76bcc16b1dab86d45a8f2 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1531,6 +1531,7 @@ GLIBC_2.38 pthread_attr_setscope F
 GLIBC_2.38 pthread_attr_setstack F
 GLIBC_2.38 pthread_attr_setstackaddr F
 GLIBC_2.38 pthread_attr_setstacksize F
+GLIBC_2.38 pthread_barrier_destroy F
 GLIBC_2.38 pthread_barrierattr_destroy F
 GLIBC_2.38 pthread_barrierattr_getpshared F
 GLIBC_2.38 pthread_barrierattr_init F
@@ -2248,6 +2249,7 @@ GLIBC_2.41 pthread_mutexattr_setrobust F
 GLIBC_2.41 pthread_mutexattr_setrobust_np F
 GLIBC_2.41 pthread_mutexattr_settype F
 GLIBC_2.41 pthread_sigmask F
+GLIBC_2.42 pthread_barrier_destroy F
 GLIBC_2.42 pthread_barrierattr_destroy F
 GLIBC_2.42 pthread_barrierattr_getpshared F
 GLIBC_2.42 pthread_barrierattr_init F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 89e10c557c94142dee9d090c0715f6d22637e9ae..51f7f722785ca67a7d515eb87ca09eaee9c6dbbb 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -39,7 +39,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_barrier_destroy F
 GLIBC_2.38 pthread_barrier_init F
 GLIBC_2.38 pthread_barrier_wait F
 GLIBC_2.38 pthread_cancel F