htl: move pthread_barrierattr_init into libc.

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

diff --git a/htl/Makefile b/htl/Makefile
index fc3c2239435f0c1b9aedac35b95f1285f305097e..7b2485471ad7295bbc59651f46cad24ab512ba09 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -28,7 +28,6 @@ libpthread-routines := \
   pt-barrier-destroy \
   pt-barrier-init \
   pt-barrier-wait \
-  pt-barrierattr-init \
   pt-barrierattr-getpshared \
   pt-barrierattr-setpshared \
   pt-destroy-specific \
@@ -161,6 +160,7 @@ routines := \
   pt-attr-setstacksize \
   pt-barrier \
   pt-barrierattr-destroy \
+  pt-barrierattr-init \
   pt-block \
   pt-block-intr \
   pt-cond \

diff --git a/htl/Versions b/htl/Versions
index 886ccb14c85f954b548ba2a2e40b2ff99a0c83b7..ccd2a6180bb0545397785018638395e0aed6c234 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -27,6 +27,7 @@ libc {
     pthread_attr_setschedparam;
     pthread_attr_init;
     pthread_barrierattr_destroy;
+    pthread_barrierattr_init;
     pthread_cond_broadcast;
     pthread_cond_destroy;
     pthread_cond_init;
@@ -126,6 +127,7 @@ libc {
 
   GLIBC_2.42 {
     pthread_barrierattr_destroy;
+    pthread_barrierattr_init;
     pthread_mutex_consistent; pthread_mutex_consistent_np;
     pthread_mutex_getprioceiling;
     pthread_mutex_setprioceiling;
@@ -206,7 +208,7 @@ libpthread {
 
     pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait;
     pthread_barrierattr_getpshared;
-    pthread_barrierattr_init; pthread_barrierattr_setpshared;
+    pthread_barrierattr_setpshared;
 
     pthread_cancel;
 

diff --git a/sysdeps/htl/pt-barrierattr-init.c b/sysdeps/htl/pt-barrierattr-init.c
index 1d2f162b83740c58e7a321481f77f6d392936d68..5a520bb989c63226dc2ca80313b8b1895928929e 100644 (file)
--- a/sysdeps/htl/pt-barrierattr-init.c
+++ b/sysdeps/htl/pt-barrierattr-init.c
@@ -18,12 +18,19 @@
 
 #include <pthread.h>
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 int
-pthread_barrierattr_init (pthread_barrierattr_t *attr)
+__pthread_barrierattr_init (pthread_barrierattr_t *attr)
 {
   ASSERT_TYPE_SIZE (pthread_barrierattr_t, __SIZEOF_PTHREAD_BARRIERATTR_T);
 
   *attr = __pthread_default_barrierattr;
   return 0;
 }
+libc_hidden_def (__pthread_barrierattr_init)
+versioned_symbol (libc, __pthread_barrierattr_init, pthread_barrierattr_init, GLIBC_2_42);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_barrierattr_init, pthread_barrierattr_init, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 68972b86c1b5a4eeb99fd1df3a0e489176a7d621..c7a62982901756d42d70e05099fd785e002a7be9 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -33,6 +33,8 @@ extern void __pthread_init_static_tls (struct link_map *) attribute_hidden;
 
 extern int __pthread_barrierattr_destroy (pthread_barrierattr_t *__attr);
 libc_hidden_proto (__pthread_barrierattr_destroy)
+extern int __pthread_barrierattr_init (pthread_barrierattr_t *__attr);
+libc_hidden_proto (__pthread_barrierattr_init)
 extern int __pthread_mutex_init (pthread_mutex_t *__mutex, const pthread_mutexattr_t *__attr);
 libc_hidden_proto (__pthread_mutex_init)
 extern int __pthread_mutex_clocklock (pthread_mutex_t *__mutex, clockid_t __clockid,

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 72dfd665f6b410098d383d438b06f9e028217cd0..eb141157db8a45d5c4eab1e6b911f95f5653fa9d 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -50,6 +50,7 @@ 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_barrierattr_destroy F
+GLIBC_2.12 pthread_barrierattr_init F
 GLIBC_2.12 pthread_cond_broadcast F
 GLIBC_2.12 pthread_cond_destroy F
 GLIBC_2.12 pthread_cond_init F
@@ -2563,6 +2564,7 @@ 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_barrierattr_destroy F
+GLIBC_2.42 pthread_barrierattr_init F
 GLIBC_2.42 pthread_mutex_consistent F
 GLIBC_2.42 pthread_mutex_consistent_np F
 GLIBC_2.42 pthread_mutex_getprioceiling F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 6d9ffec92c57667bd3b074714f6220ba27b009b0..1083a7c001b691e426fc6d484f4c1b63be1aafb7 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -26,7 +26,6 @@ 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_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_create F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index b60abc195870ab52bafe7c4130171bd129653910..e7bada388e968b0e4c615b6d46d8abad5f144361 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1532,6 +1532,7 @@ 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_barrierattr_destroy F
+GLIBC_2.38 pthread_barrierattr_init F
 GLIBC_2.38 pthread_cond_broadcast F
 GLIBC_2.38 pthread_cond_clockwait F
 GLIBC_2.38 pthread_cond_destroy F
@@ -2246,6 +2247,7 @@ 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_barrierattr_destroy F
+GLIBC_2.42 pthread_barrierattr_init F
 GLIBC_2.42 pthread_mutex_consistent F
 GLIBC_2.42 pthread_mutex_consistent_np F
 GLIBC_2.42 pthread_mutex_getprioceiling F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 860d4062511912cc1f783489a73730f88d2a280d..97a437707907c510b60417912be9541d8e4a8ac4 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -43,7 +43,6 @@ 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_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_clockjoin_np F