htl: move pthread_rwlockattr_destroy into libc.

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

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

diff --git a/htl/Versions b/htl/Versions
index c02ac04e22b0a12f4596b7d4c002a0ef4114a708..f6a1566a206610216ff1061b5c049a0746a5650d 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -63,6 +63,7 @@ libc {
     pthread_mutexattr_setprotocol;
     pthread_mutexattr_setpshared;
     pthread_mutexattr_settype;
+    pthread_rwlockattr_destroy;
     pthread_rwlockattr_init;
     pthread_setcancelstate;
     pthread_setcanceltype;
@@ -143,6 +144,7 @@ libc {
     pthread_mutex_getprioceiling;
     pthread_mutex_setprioceiling;
     pthread_mutex_trylock;
+    pthread_rwlockattr_destroy;
     pthread_rwlockattr_init;
   }
 
@@ -244,7 +246,7 @@ libpthread {
     pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock;
     pthread_rwlock_unlock; pthread_rwlock_wrlock;
 
-    pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared;
+    pthread_rwlockattr_getpshared;
     pthread_rwlockattr_setpshared;
 
     pthread_setconcurrency;

diff --git a/sysdeps/htl/pt-rwlockattr-destroy.c b/sysdeps/htl/pt-rwlockattr-destroy.c
index cf73625ce7d0386ae6b5c5e5e281e77af5595d2a..671eb84ed244559033f39d8c82f2726a8730e704 100644 (file)
--- a/sysdeps/htl/pt-rwlockattr-destroy.c
+++ b/sysdeps/htl/pt-rwlockattr-destroy.c
@@ -18,9 +18,16 @@
 
 #include <pthread.h>
 #include <pt-internal.h>
+#include <shlib-compat.h>
 
 int
-pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr)
+__pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr)
 {
   return 0;
 }
+libc_hidden_def (__pthread_rwlockattr_destroy)
+versioned_symbol (libc, __pthread_rwlockattr_destroy, pthread_rwlockattr_destroy, GLIBC_2_42);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_rwlockattr_destroy, pthread_rwlockattr_destroy, GLIBC_2_12);
+#endif

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 2f779d27cc2f001f8251850f81ebffb6fcebaa17..0f22c85d414dd7adb226afd66285f7afd910611b 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -114,6 +114,8 @@ libc_hidden_proto (__pthread_mutexattr_gettype)
 extern int __pthread_mutexattr_settype(pthread_mutexattr_t *__attr,
                                     int __type);
 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_init (pthread_rwlockattr_t *__attr);
 libc_hidden_proto (__pthread_rwlockattr_init)
 

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 096ab46b38bdf1fddd148f10a4d13ad2f51e06c5..2ed475b751e845e4178f5795356b2b5f6c565e1d 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_rwlockattr_destroy F
 GLIBC_2.12 pthread_rwlockattr_init F
 GLIBC_2.12 pthread_self F
 GLIBC_2.12 pthread_setcancelstate F
@@ -2581,6 +2582,7 @@ 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_rwlockattr_destroy F
 GLIBC_2.42 pthread_rwlockattr_init F
 GLIBC_2.5 __readlinkat_chk F
 GLIBC_2.5 inet6_opt_append F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 7a20505888591deade39243b5ba2f2f3fcd77d44..ad5fb60d4bf1f08ec9c42b19bf03bfcdede11e44 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -45,7 +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_destroy F
 GLIBC_2.12 pthread_rwlockattr_getpshared F
 GLIBC_2.12 pthread_rwlockattr_setpshared 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 d0010a3ce96c28007190761417c109824ca97b48..9ab097d9d86796246fa173cdca12ba06e178739b 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1579,6 +1579,7 @@ 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_rwlockattr_destroy F
 GLIBC_2.38 pthread_rwlockattr_init F
 GLIBC_2.38 pthread_self F
 GLIBC_2.38 pthread_setcancelstate F
@@ -2264,6 +2265,7 @@ 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_rwlockattr_destroy F
 GLIBC_2.42 pthread_rwlockattr_init F
 HURD_CTHREADS_0.3 __cthread_getspecific F
 HURD_CTHREADS_0.3 __cthread_keycreate F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index a5f5b0a2c735ce3fa81107e827ed6e8f3884a74a..a6c70d36adc91454e89aa1ed99e5fc74efed81a2 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -67,7 +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_destroy F
 GLIBC_2.38 pthread_rwlockattr_getpshared F
 GLIBC_2.38 pthread_rwlockattr_setpshared F
 GLIBC_2.38 pthread_setconcurrency F