htl: move pthread_rwlockattr_getpshared, pthread_rwlockattr_setpshared into libc.

Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20250216145434.7089-5-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 84b85f1a9ac137b33f8ca968c00d1884916fbf04..651af8d82af2129c609012eb5298e3a9315c751a 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -45,8 +45,6 @@ libpthread-routines := \
   pt-testcancel \
   pt-cancel \
   pt-mutex-transfer-np \
-  pt-rwlockattr-getpshared \
-  pt-rwlockattr-setpshared \
   pt-rwlock-init \
   pt-rwlock-destroy \
   pt-rwlock-rdlock \
@@ -200,7 +198,9 @@ routines := \
   pt-pthread_self \
   pt-rwlock-attr \
   pt-rwlockattr-destroy \
+  pt-rwlockattr-getpshared \
   pt-rwlockattr-init \
+  pt-rwlockattr-setpshared \
   pt-self pt-equal \
   pt-setcancelstate \
   pt-setcanceltype \

diff --git a/htl/Versions b/htl/Versions
index f6a1566a206610216ff1061b5c049a0746a5650d..1d666bcb3c21864816206f0d8fac4c1467052586 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -64,7 +64,9 @@ libc {
     pthread_mutexattr_setpshared;
     pthread_mutexattr_settype;
     pthread_rwlockattr_destroy;
+    pthread_rwlockattr_getpshared;
     pthread_rwlockattr_init;
+    pthread_rwlockattr_setpshared;
     pthread_setcancelstate;
     pthread_setcanceltype;
     pthread_sigmask;
@@ -145,7 +147,9 @@ libc {
     pthread_mutex_setprioceiling;
     pthread_mutex_trylock;
     pthread_rwlockattr_destroy;
+    pthread_rwlockattr_getpshared;
     pthread_rwlockattr_init;
+    pthread_rwlockattr_setpshared;
   }
 
   GLIBC_PRIVATE {
@@ -246,9 +250,6 @@ libpthread {
     pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock;
     pthread_rwlock_unlock; pthread_rwlock_wrlock;
 
-    pthread_rwlockattr_getpshared;
-    pthread_rwlockattr_setpshared;
-
     pthread_setconcurrency;
     pthread_setschedprio; pthread_setspecific;
 

diff --git a/sysdeps/htl/pt-rwlockattr-getpshared.c b/sysdeps/htl/pt-rwlockattr-getpshared.c
index 9e57d39c41535c36804744c10b0f626e77442c0a..15470ada0988cb8d43b70ec7c8de63a129a4624b 100644 (file)
--- a/sysdeps/htl/pt-rwlockattr-getpshared.c
+++ b/sysdeps/htl/pt-rwlockattr-getpshared.c
@@ -18,10 +18,17 @@
 
 #include <pthread.h>
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 int
-pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared)
+__pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared)
 {
   *pshared = attr->__pshared;
   return 0;
 }
+libc_hidden_def (__pthread_rwlockattr_getpshared)
+versioned_symbol (libc, __pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared, GLIBC_2_42);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pt-rwlockattr-setpshared.c b/sysdeps/htl/pt-rwlockattr-setpshared.c
index 94fdf761c0ac0ae70309e66352cb245d2c303d01..e23a032d4ab803629125d7a34d7493839a947282 100644 (file)
--- a/sysdeps/htl/pt-rwlockattr-setpshared.c
+++ b/sysdeps/htl/pt-rwlockattr-setpshared.c
@@ -18,9 +18,10 @@
 
 #include <pthread.h>
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 int
-pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared)
+__pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared)
 {
   switch (pshared)
     {
@@ -35,4 +36,10 @@ pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared)
       return EINVAL;
     }
 }
+libc_hidden_def (__pthread_rwlockattr_setpshared)
+versioned_symbol (libc, __pthread_rwlockattr_setpshared, pthread_rwlockattr_setpshared, GLIBC_2_42);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_rwlockattr_setpshared, pthread_rwlockattr_setpshared, GLIBC_2_12);
+#endif
 stub_warning (pthread_rwlockattr_setpshared)

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 0f22c85d414dd7adb226afd66285f7afd910611b..d77cee51a5ccae486257e0b07e53b26662c4a933 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -116,8 +116,14 @@ extern int __pthread_mutexattr_settype(pthread_mutexattr_t *__attr,
 libc_hidden_proto (__pthread_mutexattr_settype)
 extern int __pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr);
 libc_hidden_proto (__pthread_rwlockattr_destroy)
+extern int __pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *__attr,
+                                         int *__pshared);
+libc_hidden_proto (__pthread_rwlockattr_getpshared)
 extern int __pthread_rwlockattr_init (pthread_rwlockattr_t *__attr);
 libc_hidden_proto (__pthread_rwlockattr_init)
+extern int __pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr,
+                                         int __pshared);
+libc_hidden_proto (__pthread_rwlockattr_setpshared)
 
 extern int __pthread_cond_init (pthread_cond_t *cond,
                                const pthread_condattr_t *cond_attr);

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 2ed475b751e845e4178f5795356b2b5f6c565e1d..55ad6b423f87ce410b3a506ce99c4d6c2d5f15dd 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -89,7 +89,9 @@ GLIBC_2.12 pthread_mutexattr_setprotocol F
 GLIBC_2.12 pthread_mutexattr_setpshared F
 GLIBC_2.12 pthread_mutexattr_settype F
 GLIBC_2.12 pthread_rwlockattr_destroy F
+GLIBC_2.12 pthread_rwlockattr_getpshared F
 GLIBC_2.12 pthread_rwlockattr_init F
+GLIBC_2.12 pthread_rwlockattr_setpshared F
 GLIBC_2.12 pthread_self F
 GLIBC_2.12 pthread_setcancelstate F
 GLIBC_2.12 pthread_setcanceltype F
@@ -2583,7 +2585,9 @@ GLIBC_2.42 pthread_mutex_getprioceiling F
 GLIBC_2.42 pthread_mutex_setprioceiling F
 GLIBC_2.42 pthread_mutex_trylock F
 GLIBC_2.42 pthread_rwlockattr_destroy F
+GLIBC_2.42 pthread_rwlockattr_getpshared F
 GLIBC_2.42 pthread_rwlockattr_init F
+GLIBC_2.42 pthread_rwlockattr_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 ad5fb60d4bf1f08ec9c42b19bf03bfcdede11e44..df7c46455aa7b4f663ddff27e2d98da245cbbc6a 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -45,8 +45,6 @@ GLIBC_2.12 pthread_rwlock_tryrdlock F
 GLIBC_2.12 pthread_rwlock_trywrlock F
 GLIBC_2.12 pthread_rwlock_unlock F
 GLIBC_2.12 pthread_rwlock_wrlock F
-GLIBC_2.12 pthread_rwlockattr_getpshared F
-GLIBC_2.12 pthread_rwlockattr_setpshared F
 GLIBC_2.12 pthread_setconcurrency F
 GLIBC_2.12 pthread_setschedprio F
 GLIBC_2.12 pthread_setspecific F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 9ab097d9d86796246fa173cdca12ba06e178739b..3075e10305166ea35eb090fcae7a65d68fb0c773 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1580,7 +1580,9 @@ GLIBC_2.38 pthread_mutexattr_setrobust F
 GLIBC_2.38 pthread_mutexattr_setrobust_np F
 GLIBC_2.38 pthread_mutexattr_settype F
 GLIBC_2.38 pthread_rwlockattr_destroy F
+GLIBC_2.38 pthread_rwlockattr_getpshared F
 GLIBC_2.38 pthread_rwlockattr_init F
+GLIBC_2.38 pthread_rwlockattr_setpshared F
 GLIBC_2.38 pthread_self F
 GLIBC_2.38 pthread_setcancelstate F
 GLIBC_2.38 pthread_setcanceltype F
@@ -2266,7 +2268,9 @@ GLIBC_2.42 pthread_mutex_getprioceiling F
 GLIBC_2.42 pthread_mutex_setprioceiling F
 GLIBC_2.42 pthread_mutex_trylock F
 GLIBC_2.42 pthread_rwlockattr_destroy F
+GLIBC_2.42 pthread_rwlockattr_getpshared F
 GLIBC_2.42 pthread_rwlockattr_init F
+GLIBC_2.42 pthread_rwlockattr_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 a6c70d36adc91454e89aa1ed99e5fc74efed81a2..89fe63f2560a33e6bddd8a6756404ace777f0ae7 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -67,8 +67,6 @@ GLIBC_2.38 pthread_rwlock_tryrdlock F
 GLIBC_2.38 pthread_rwlock_trywrlock F
 GLIBC_2.38 pthread_rwlock_unlock F
 GLIBC_2.38 pthread_rwlock_wrlock F
-GLIBC_2.38 pthread_rwlockattr_getpshared F
-GLIBC_2.38 pthread_rwlockattr_setpshared F
 GLIBC_2.38 pthread_setconcurrency F
 GLIBC_2.38 pthread_setschedprio F
 GLIBC_2.38 pthread_setspecific F