htl: move pthread_rwlock_tryrdlock, pthread_rwlock_trywrlock into libc.

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

diff --git a/htl/Makefile b/htl/Makefile
index 651af8d82af2129c609012eb5298e3a9315c751a..0c85ab462cf40accf437f9c4d686b421c8dbec71 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -48,8 +48,6 @@ libpthread-routines := \
   pt-rwlock-init \
   pt-rwlock-destroy \
   pt-rwlock-rdlock \
-  pt-rwlock-tryrdlock \
-  pt-rwlock-trywrlock \
   pt-rwlock-wrlock \
   pt-rwlock-timedrdlock \
   pt-rwlock-timedwrlock \
@@ -197,6 +195,8 @@ routines := \
   pt-nthreads \
   pt-pthread_self \
   pt-rwlock-attr \
+  pt-rwlock-tryrdlock \
+  pt-rwlock-trywrlock \
   pt-rwlockattr-destroy \
   pt-rwlockattr-getpshared \
   pt-rwlockattr-init \

diff --git a/htl/Versions b/htl/Versions
index 1d666bcb3c21864816206f0d8fac4c1467052586..ca59cd5c9908b3fc4f039884a0b8db68fdcc9bcf 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -63,6 +63,8 @@ libc {
     pthread_mutexattr_setprotocol;
     pthread_mutexattr_setpshared;
     pthread_mutexattr_settype;
+    pthread_rwlock_tryrdlock;
+    pthread_rwlock_trywrlock;
     pthread_rwlockattr_destroy;
     pthread_rwlockattr_getpshared;
     pthread_rwlockattr_init;
@@ -146,6 +148,8 @@ libc {
     pthread_mutex_getprioceiling;
     pthread_mutex_setprioceiling;
     pthread_mutex_trylock;
+    pthread_rwlock_tryrdlock;
+    pthread_rwlock_trywrlock;
     pthread_rwlockattr_destroy;
     pthread_rwlockattr_getpshared;
     pthread_rwlockattr_init;
@@ -247,7 +251,6 @@ libpthread {
 
     pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock;
     pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock;
-    pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock;
     pthread_rwlock_unlock; pthread_rwlock_wrlock;
 
     pthread_setconcurrency;

diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h
index 6804c0d6361407f6cbf8839c7440242003ca8e46..5fad451dfcf173d0659a394c5ab5b1d59aaddf03 100644 (file)
--- a/sysdeps/htl/libc-lockP.h
+++ b/sysdeps/htl/libc-lockP.h
@@ -98,10 +98,12 @@ extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
 extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
 
 extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock);
+libc_hidden_proto (__pthread_rwlock_tryrdlock)
 
 extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock);
 
 extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
+libc_hidden_proto (__pthread_rwlock_trywrlock)
 
 extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
 
@@ -121,9 +123,7 @@ libc_hidden_proto (__pthread_setcancelstate)
 weak_extern (__pthread_rwlock_init)
 weak_extern (__pthread_rwlock_destroy)
 weak_extern (__pthread_rwlock_rdlock)
-weak_extern (__pthread_rwlock_tryrdlock)
 weak_extern (__pthread_rwlock_wrlock)
-weak_extern (__pthread_rwlock_trywrlock)
 weak_extern (__pthread_rwlock_unlock)
 weak_extern (__pthread_key_create)
 weak_extern (__pthread_setspecific)
@@ -134,9 +134,7 @@ weak_extern (__pthread_atfork)
 # else
 #  pragma weak __pthread_rwlock_destroy
 #  pragma weak __pthread_rwlock_rdlock
-#  pragma weak __pthread_rwlock_tryrdlock
 #  pragma weak __pthread_rwlock_wrlock
-#  pragma weak __pthread_rwlock_trywrlock
 #  pragma weak __pthread_rwlock_unlock
 #  pragma weak __pthread_key_create
 #  pragma weak __pthread_setspecific

diff --git a/sysdeps/htl/pt-rwlock-tryrdlock.c b/sysdeps/htl/pt-rwlock-tryrdlock.c
index c34ffccbc49bf940986bd42c8c65b9dd3af78ace..74aa636f930953cec18aaa0804ad285fde1061d0 100644 (file)
--- a/sysdeps/htl/pt-rwlock-tryrdlock.c
+++ b/sysdeps/htl/pt-rwlock-tryrdlock.c
@@ -18,12 +18,12 @@
 
 #include <pthread.h>
 #include <assert.h>
-
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 /* Try to acquire RWLOCK.  */
 int
-pthread_rwlock_tryrdlock (struct __pthread_rwlock *rwlock)
+__pthread_rwlock_tryrdlock (struct __pthread_rwlock *rwlock)
 {
   __pthread_spin_wait (&rwlock->__lock);
   if (__pthread_spin_trylock (&rwlock->__held) == 0)
@@ -53,3 +53,9 @@ pthread_rwlock_tryrdlock (struct __pthread_rwlock *rwlock)
 
   return EBUSY;
 }
+libc_hidden_def (__pthread_rwlock_tryrdlock)
+versioned_symbol (libc, __pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock, GLIBC_2_42);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pt-rwlock-trywrlock.c b/sysdeps/htl/pt-rwlock-trywrlock.c
index 926637a3ff8b9ab338dbb5e7ed6fd153470480a8..8de0e59132634d352735fa680953ab73920aa408 100644 (file)
--- a/sysdeps/htl/pt-rwlock-trywrlock.c
+++ b/sysdeps/htl/pt-rwlock-trywrlock.c
@@ -18,12 +18,12 @@
 
 #include <pthread.h>
 #include <assert.h>
-
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 /* Try to acquire RWLOCK for writing.  */
 int
-pthread_rwlock_trywrlock (struct __pthread_rwlock *rwlock)
+__pthread_rwlock_trywrlock (struct __pthread_rwlock *rwlock)
 {
   __pthread_spin_wait (&rwlock->__lock);
   if (__pthread_spin_trylock (&rwlock->__held) == 0)
@@ -43,3 +43,9 @@ pthread_rwlock_trywrlock (struct __pthread_rwlock *rwlock)
 
   return EBUSY;
 }
+libc_hidden_def (__pthread_rwlock_trywrlock)
+versioned_symbol (libc, __pthread_rwlock_trywrlock, pthread_rwlock_trywrlock, GLIBC_2_42);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_rwlock_trywrlock, pthread_rwlock_trywrlock, GLIBC_2_12);
+#endif

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 55ad6b423f87ce410b3a506ce99c4d6c2d5f15dd..3d786282fa3868921584dca4128886fbe9923e63 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -88,6 +88,8 @@ GLIBC_2.12 pthread_mutexattr_setprioceiling F
 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_rwlock_tryrdlock F
+GLIBC_2.12 pthread_rwlock_trywrlock F
 GLIBC_2.12 pthread_rwlockattr_destroy F
 GLIBC_2.12 pthread_rwlockattr_getpshared F
 GLIBC_2.12 pthread_rwlockattr_init F
@@ -2584,6 +2586,8 @@ GLIBC_2.42 pthread_mutex_consistent_np F
 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_rwlock_tryrdlock F
+GLIBC_2.42 pthread_rwlock_trywrlock F
 GLIBC_2.42 pthread_rwlockattr_destroy F
 GLIBC_2.42 pthread_rwlockattr_getpshared F
 GLIBC_2.42 pthread_rwlockattr_init F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index df7c46455aa7b4f663ddff27e2d98da245cbbc6a..70db951b1060ff4804b2ade6d4bdc4fafe70f7f6 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -41,8 +41,6 @@ GLIBC_2.12 pthread_rwlock_init F
 GLIBC_2.12 pthread_rwlock_rdlock F
 GLIBC_2.12 pthread_rwlock_timedrdlock F
 GLIBC_2.12 pthread_rwlock_timedwrlock F
-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_setconcurrency F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 3075e10305166ea35eb090fcae7a65d68fb0c773..305cdb8cef05748d8fae10374e247040d86f4577 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1579,6 +1579,8 @@ GLIBC_2.38 pthread_mutexattr_setpshared F
 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_rwlock_tryrdlock F
+GLIBC_2.38 pthread_rwlock_trywrlock F
 GLIBC_2.38 pthread_rwlockattr_destroy F
 GLIBC_2.38 pthread_rwlockattr_getpshared F
 GLIBC_2.38 pthread_rwlockattr_init F
@@ -2267,6 +2269,8 @@ GLIBC_2.42 pthread_mutex_consistent_np F
 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_rwlock_tryrdlock F
+GLIBC_2.42 pthread_rwlock_trywrlock F
 GLIBC_2.42 pthread_rwlockattr_destroy F
 GLIBC_2.42 pthread_rwlockattr_getpshared F
 GLIBC_2.42 pthread_rwlockattr_init F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 89fe63f2560a33e6bddd8a6756404ace777f0ae7..b712a1b3bf79017d1d20970cae31d0213b55048e 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -63,8 +63,6 @@ GLIBC_2.38 pthread_rwlock_init F
 GLIBC_2.38 pthread_rwlock_rdlock F
 GLIBC_2.38 pthread_rwlock_timedrdlock F
 GLIBC_2.38 pthread_rwlock_timedwrlock F
-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_setconcurrency F