htl: move pthread_rwlock_destroy into libc.

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

diff --git a/htl/Makefile b/htl/Makefile
index 85c7b61e990862c25f820c248e0b554951bde557..78d997d4abf789031893b977ed8ee33df7961651 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -46,7 +46,6 @@ libpthread-routines := \
   pt-cancel \
   pt-mutex-transfer-np \
   pt-rwlock-init \
-  pt-rwlock-destroy \
   pt-hurd-cond-wait \
   pt-hurd-cond-timedwait \
   pt-stack-alloc \
@@ -190,6 +189,7 @@ routines := \
   pt-nthreads \
   pt-pthread_self \
   pt-rwlock-attr \
+  pt-rwlock-destroy \
   pt-rwlock-rdlock \
   pt-rwlock-timedrdlock \
   pt-rwlock-timedwrlock \

diff --git a/htl/Versions b/htl/Versions
index 4c4ceb102c53ced0871edb3ea933a0838dc9cf48..f636e6ede5a2dda69f561f58a5a6a3a5fba5f533 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -63,6 +63,7 @@ libc {
     pthread_mutexattr_setprotocol;
     pthread_mutexattr_setpshared;
     pthread_mutexattr_settype;
+    pthread_rwlock_destroy;
     pthread_rwlock_rdlock;
     pthread_rwlock_timedrdlock;
     pthread_rwlock_timedwrlock;
@@ -154,6 +155,7 @@ libc {
     pthread_mutex_consistent; pthread_mutex_consistent_np;
     pthread_mutex_getprioceiling;
     pthread_mutex_setprioceiling;
+    pthread_rwlock_destroy;
     pthread_mutex_trylock;
     pthread_rwlock_clockrdlock;
     pthread_rwlock_clockwrlock;
@@ -263,7 +265,7 @@ libpthread {
 
     pthread_once;
 
-    pthread_rwlock_destroy; pthread_rwlock_init;
+    pthread_rwlock_init;
 
     pthread_setconcurrency;
     pthread_setschedprio; pthread_setspecific;
@@ -318,6 +320,6 @@ libpthread {
     __pthread_getattr_np;
     __pthread_enable_asynccancel;
     __pthread_disable_asynccancel;
-    _pthread_rwlock_destroy; _pthread_rwlock_init;
+    _pthread_rwlock_init;
   }
 }

diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h
index ae2e4668bb0c5d3f9bc0192883674895f8f0b5f2..1b5c23ebac6dddf4e1baf8842124beb06c360be6 100644 (file)
--- a/sysdeps/htl/libc-lockP.h
+++ b/sysdeps/htl/libc-lockP.h
@@ -94,6 +94,7 @@ extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock,
                                  const pthread_rwlockattr_t *__attr);
 
 extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
+libc_hidden_proto (__pthread_rwlock_destroy)
 
 extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
 libc_hidden_proto (__pthread_rwlock_rdlock)
@@ -124,7 +125,6 @@ libc_hidden_proto (__pthread_setcancelstate)
 #if !defined(__NO_WEAK_PTHREAD_ALIASES) && !IS_IN (libpthread)
 # ifdef weak_extern
 weak_extern (__pthread_rwlock_init)
-weak_extern (__pthread_rwlock_destroy)
 weak_extern (__pthread_key_create)
 weak_extern (__pthread_setspecific)
 weak_extern (__pthread_getspecific)
@@ -132,7 +132,6 @@ weak_extern (__pthread_once)
 weak_extern (__pthread_initialize)
 weak_extern (__pthread_atfork)
 # else
-#  pragma weak __pthread_rwlock_destroy
 #  pragma weak __pthread_key_create
 #  pragma weak __pthread_setspecific
 #  pragma weak __pthread_getspecific

diff --git a/sysdeps/htl/pt-rwlock-destroy.c b/sysdeps/htl/pt-rwlock-destroy.c
index 0f862c89a225e09a7d99cb19b66370a19f8ad31e..ffdd3c01873c482249e611c00fa28399e66087d1 100644 (file)
--- a/sysdeps/htl/pt-rwlock-destroy.c
+++ b/sysdeps/htl/pt-rwlock-destroy.c
@@ -18,11 +18,16 @@
 
 #include <pthread.h>
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 int
-_pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
+__pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
 {
   return 0;
 }
+libc_hidden_def (__pthread_rwlock_destroy)
+versioned_symbol (libc, __pthread_rwlock_destroy, pthread_rwlock_destroy, GLIBC_2_42);
 
-strong_alias (_pthread_rwlock_destroy, pthread_rwlock_destroy);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_rwlock_destroy, pthread_rwlock_destroy, GLIBC_2_12);
+#endif

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 7fd490912b2bb59ea0a7330e0fd251a4443a8a47..e96b22bde43cc9683227c8ccb584becd1159bc77 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -88,6 +88,7 @@ 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_destroy F
 GLIBC_2.12 pthread_rwlock_rdlock F
 GLIBC_2.12 pthread_rwlock_timedrdlock F
 GLIBC_2.12 pthread_rwlock_timedwrlock F
@@ -2595,6 +2596,7 @@ GLIBC_2.42 pthread_mutex_setprioceiling F
 GLIBC_2.42 pthread_mutex_trylock F
 GLIBC_2.42 pthread_rwlock_clockrdlock F
 GLIBC_2.42 pthread_rwlock_clockwrlock F
+GLIBC_2.42 pthread_rwlock_destroy F
 GLIBC_2.42 pthread_rwlock_rdlock F
 GLIBC_2.42 pthread_rwlock_timedrdlock F
 GLIBC_2.42 pthread_rwlock_timedwrlock F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 1b4cfa5f1ef37ffe3ce42cf29e843c1da2ce754b..3ebfa63738c37c6f4d8661835f8d1eb3f51106fe 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -36,7 +36,6 @@ GLIBC_2.12 pthread_key_delete F
 GLIBC_2.12 pthread_kill F
 GLIBC_2.12 pthread_mutex_transfer_np F
 GLIBC_2.12 pthread_once F
-GLIBC_2.12 pthread_rwlock_destroy F
 GLIBC_2.12 pthread_rwlock_init F
 GLIBC_2.12 pthread_setconcurrency F
 GLIBC_2.12 pthread_setschedprio F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index dfda521360abaf5d1737e2e94d57bc726ba5899f..f5559a16fa4fe4baca7cc24144a286594503f2ca 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1581,6 +1581,7 @@ GLIBC_2.38 pthread_mutexattr_setrobust_np F
 GLIBC_2.38 pthread_mutexattr_settype F
 GLIBC_2.38 pthread_rwlock_clockrdlock F
 GLIBC_2.38 pthread_rwlock_clockwrlock F
+GLIBC_2.38 pthread_rwlock_destroy F
 GLIBC_2.38 pthread_rwlock_rdlock F
 GLIBC_2.38 pthread_rwlock_timedrdlock F
 GLIBC_2.38 pthread_rwlock_timedwrlock F
@@ -2278,6 +2279,7 @@ GLIBC_2.42 pthread_mutex_setprioceiling F
 GLIBC_2.42 pthread_mutex_trylock F
 GLIBC_2.42 pthread_rwlock_clockrdlock F
 GLIBC_2.42 pthread_rwlock_clockwrlock F
+GLIBC_2.42 pthread_rwlock_destroy F
 GLIBC_2.42 pthread_rwlock_rdlock F
 GLIBC_2.42 pthread_rwlock_timedrdlock F
 GLIBC_2.42 pthread_rwlock_timedwrlock F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 32b0b50275420f14d24f8282b53741f4634458fd..106aa09d8a3ecd9edf41d0c4aeb2c97440c51cef 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -56,7 +56,6 @@ GLIBC_2.38 pthread_key_delete F
 GLIBC_2.38 pthread_kill F
 GLIBC_2.38 pthread_mutex_transfer_np F
 GLIBC_2.38 pthread_once F
-GLIBC_2.38 pthread_rwlock_destroy F
 GLIBC_2.38 pthread_rwlock_init F
 GLIBC_2.38 pthread_setconcurrency F
 GLIBC_2.38 pthread_setschedprio F