htl: move pthread_condattr_setpshared into libc.

Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241126205329.2215295-8-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 56424aee98e4ff3f225d824275d5f3d43f08a610..b0bc0d97bf5045a3d8874356662e2eeb3fa418e4 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -92,7 +92,6 @@ libpthread-routines := \
   pt-rwlock-timedrdlock \
   pt-rwlock-timedwrlock \
   pt-rwlock-unlock \
-  pt-condattr-setpshared \
   pt-cond-destroy \
   pt-cond-init \
   pt-cond-brdcast \
@@ -206,6 +205,7 @@ routines := \
   pt-condattr-getpshared \
   pt-condattr-init \
   pt-condattr-setclock \
+  pt-condattr-setpshared \
   pt-getschedparam \
   pt-nthreads \
   pt-pthread_self \

diff --git a/htl/Versions b/htl/Versions
index 533b871e42cbb73836ac3d97338ca33f569e386b..33a3cfa7a57b0c9d45b18f009714939c1ce2c226 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -31,6 +31,7 @@ libc {
     pthread_condattr_destroy;
     pthread_condattr_getpshared;
     pthread_condattr_setclock;
+    pthread_condattr_setpshared;
   }
 
   GLIBC_2.21 {
@@ -72,6 +73,7 @@ libc {
     pthread_condattr_getclock;
     pthread_condattr_getpshared;
     pthread_condattr_setclock;
+    pthread_condattr_setpshared;
   }
 
 
@@ -129,8 +131,6 @@ libpthread {
     pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init;
     pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait;
 
-    pthread_condattr_setpshared;
-
     pthread_create; pthread_detach; pthread_exit;
 
     pthread_getattr_np;

diff --git a/sysdeps/htl/pt-condattr-setpshared.c b/sysdeps/htl/pt-condattr-setpshared.c
index c78906d22c667f4ba5b6e3436dab9051cf81835f..e8c8730488e96b8fbeead162e10501866c3fc11f 100644 (file)
--- a/sysdeps/htl/pt-condattr-setpshared.c
+++ b/sysdeps/htl/pt-condattr-setpshared.c
@@ -17,10 +17,11 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
+#include <shlib-compat.h>
 #include <pt-internal.h>
 
 int
-pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared)
+__pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared)
 {
   switch (pshared)
     {
@@ -36,3 +37,8 @@ pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared)
     }
 }
 stub_warning (pthread_condattr_setpshared)
+versioned_symbol (libc, __pthread_condattr_setpshared, pthread_condattr_setpshared, GLIBC_2_41);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_condattr_setpshared, pthread_condattr_setpshared, GLIBC_2_12);
+#endif

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index a2cc574265ec5e1d7a05a9a5199f68c1abb3f8dc..76ded62c80cede36440b06f9b9b2e7065d751f87 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -54,6 +54,7 @@ GLIBC_2.12 pthread_condattr_getclock F
 GLIBC_2.12 pthread_condattr_getpshared F
 GLIBC_2.12 pthread_condattr_init F
 GLIBC_2.12 pthread_condattr_setclock F
+GLIBC_2.12 pthread_condattr_setpshared F
 GLIBC_2.12 pthread_equal F
 GLIBC_2.12 pthread_getschedparam F
 GLIBC_2.12 pthread_self F
@@ -2511,6 +2512,7 @@ GLIBC_2.41 pthread_attr_setstacksize F
 GLIBC_2.41 pthread_condattr_getclock F
 GLIBC_2.41 pthread_condattr_getpshared F
 GLIBC_2.41 pthread_condattr_setclock F
+GLIBC_2.41 pthread_condattr_setpshared F
 GLIBC_2.5 __readlinkat_chk F
 GLIBC_2.5 inet6_opt_append F
 GLIBC_2.5 inet6_opt_find F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index cd398f2fced5b233f3dbf5698c9af15ab27d2499..72cb549b2411df27d3ffd5d2a7f56562071283c0 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -36,7 +36,6 @@ GLIBC_2.12 pthread_cond_init F
 GLIBC_2.12 pthread_cond_signal F
 GLIBC_2.12 pthread_cond_timedwait F
 GLIBC_2.12 pthread_cond_wait F
-GLIBC_2.12 pthread_condattr_setpshared 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 2ff7027df4fd0d208454b11a89dc945f7b3d7191..c2ee0b1c1a9e3af5959f6de657c0ed9ef0847776 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1542,6 +1542,7 @@ GLIBC_2.38 pthread_condattr_getclock F
 GLIBC_2.38 pthread_condattr_getpshared F
 GLIBC_2.38 pthread_condattr_init F
 GLIBC_2.38 pthread_condattr_setclock F
+GLIBC_2.38 pthread_condattr_setpshared F
 GLIBC_2.38 pthread_equal F
 GLIBC_2.38 pthread_exit F
 GLIBC_2.38 pthread_getschedparam F
@@ -2206,6 +2207,7 @@ GLIBC_2.41 pthread_attr_setstacksize F
 GLIBC_2.41 pthread_condattr_getclock F
 GLIBC_2.41 pthread_condattr_getpshared F
 GLIBC_2.41 pthread_condattr_setclock F
+GLIBC_2.41 pthread_condattr_setpshared F
 HURD_CTHREADS_0.3 __cthread_getspecific F
 HURD_CTHREADS_0.3 __cthread_keycreate F
 HURD_CTHREADS_0.3 __cthread_setspecific F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index aa8f7802ce67f6c14b8832fabff8c59322735c1f..bdadfd764a004ad11a2e23175443c0fb33450378 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -55,7 +55,6 @@ GLIBC_2.38 pthread_cond_init F
 GLIBC_2.38 pthread_cond_signal F
 GLIBC_2.38 pthread_cond_timedwait F
 GLIBC_2.38 pthread_cond_wait F
-GLIBC_2.38 pthread_condattr_setpshared F
 GLIBC_2.38 pthread_create F
 GLIBC_2.38 pthread_detach F
 GLIBC_2.38 pthread_exit F