htl: move pthread_mutexattr_destroy into libc.

Message-ID: <20241231134909.1166440-3-gfleury@disroot.org>

8 files changed, 9 insertions, 7 deletions

diff --git a/htl/Makefile b/htl/Makefile
index 5d1f7af..e2b22af 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -54,7 +54,6 @@ libpthread-routines := \
   pt-setcanceltype \
   pt-testcancel \
   pt-cancel \
-  pt-mutexattr-destroy \
   pt-mutexattr-getprioceiling \
   pt-mutexattr-getprotocol \
   pt-mutexattr-getpshared \
@@ -200,6 +199,7 @@ routines := \
   pt-condattr-setpshared \
   pt-getschedparam \
   pt-mutex-checklocked \
+  pt-mutexattr-destroy \
   pt-mutexattr-init \
   pt-nthreads \
   pt-pthread_self \
diff --git a/htl/Versions b/htl/Versions
index ae0e794..d3ee842 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -38,6 +38,7 @@ libc {
     pthread_condattr_getpshared;
     pthread_condattr_setclock;
     pthread_condattr_setpshared;
+    pthread_mutexattr_destroy;
     pthread_mutexattr_init;
     pthread_sigmask;
   }
@@ -115,6 +116,7 @@ libc {
     __pthread_condattr_init;
     __pthread_default_condattr;
     __pthread_mutex_checklocked;
+    __pthread_mutexattr_destroy;
     __pthread_mutexattr_init;
     __pthread_sigstate;
     __pthread_sigstate_destroy;
@@ -176,7 +178,7 @@ libpthread {
     pthread_mutex_timedlock; pthread_mutex_transfer_np;
     pthread_mutex_trylock; pthread_mutex_unlock;
 
-    pthread_mutexattr_destroy; pthread_mutexattr_getprioceiling;
+    pthread_mutexattr_getprioceiling;
     pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared;
     pthread_mutexattr_gettype;
     pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol;
diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h
index 404bd9f..a3a53e8 100644
--- a/sysdeps/htl/libc-lockP.h
+++ b/sysdeps/htl/libc-lockP.h
@@ -77,6 +77,7 @@ extern int __pthread_mutex_init (pthread_mutex_t *__mutex,
 				 const pthread_mutexattr_t *__mutex_attr);
 
 extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
+libc_hidden_proto (__pthread_mutex_destroy)
 
 extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex);
 
@@ -88,6 +89,7 @@ extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr);
 libc_hidden_proto (__pthread_mutexattr_init)
 
 extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr);
+libc_hidden_proto (__pthread_mutexattr_destroy)
 
 extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr,
 					int __kind);
@@ -123,7 +125,6 @@ weak_extern (__pthread_mutex_destroy)
 weak_extern (__pthread_mutex_lock)
 weak_extern (__pthread_mutex_trylock)
 weak_extern (__pthread_mutex_unlock)
-weak_extern (__pthread_mutexattr_destroy)
 weak_extern (__pthread_mutexattr_settype)
 weak_extern (__pthread_rwlock_init)
 weak_extern (__pthread_rwlock_destroy)
@@ -145,7 +146,6 @@ weak_extern (__pthread_setcancelstate)
 #  pragma weak __pthread_mutex_lock
 #  pragma weak __pthread_mutex_trylock
 #  pragma weak __pthread_mutex_unlock
-#  pragma weak __pthread_mutexattr_destroy
 #  pragma weak __pthread_mutexattr_settype
 #  pragma weak __pthread_rwlock_destroy
 #  pragma weak __pthread_rwlock_rdlock
diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-destroy.c b/sysdeps/mach/hurd/htl/pt-mutexattr-destroy.c
index 47e74b4..9d92a06 100644
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-destroy.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-destroy.c
@@ -29,5 +29,5 @@ __pthread_mutexattr_destroy (pthread_mutexattr_t *attrp)
   (void) attrp;
   return 0;
 }
-
+hidden_def (__pthread_mutexattr_destroy)
 weak_alias (__pthread_mutexattr_destroy, pthread_mutexattr_destroy)
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 9a11c29..69af145 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -63,6 +63,7 @@ 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_mutexattr_destroy F
 GLIBC_2.12 pthread_mutexattr_init F
 GLIBC_2.12 pthread_self F
 GLIBC_2.12 pthread_setschedparam F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 7e4c7ff..0fd3e53 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -50,7 +50,6 @@ GLIBC_2.12 pthread_mutex_timedlock F
 GLIBC_2.12 pthread_mutex_transfer_np F
 GLIBC_2.12 pthread_mutex_trylock F
 GLIBC_2.12 pthread_mutex_unlock F
-GLIBC_2.12 pthread_mutexattr_destroy F
 GLIBC_2.12 pthread_mutexattr_getprioceiling F
 GLIBC_2.12 pthread_mutexattr_getprotocol F
 GLIBC_2.12 pthread_mutexattr_getpshared F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 191446e..52e698f 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1551,6 +1551,7 @@ GLIBC_2.38 pthread_mutex_destroy F
 GLIBC_2.38 pthread_mutex_init F
 GLIBC_2.38 pthread_mutex_lock F
 GLIBC_2.38 pthread_mutex_unlock F
+GLIBC_2.38 pthread_mutexattr_destroy F
 GLIBC_2.38 pthread_mutexattr_init F
 GLIBC_2.38 pthread_self F
 GLIBC_2.38 pthread_setcancelstate F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 26cb3e6..90ea26b 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -73,7 +73,6 @@ GLIBC_2.38 pthread_mutex_timedlock F
 GLIBC_2.38 pthread_mutex_transfer_np F
 GLIBC_2.38 pthread_mutex_trylock F
 GLIBC_2.38 pthread_mutex_unlock F
-GLIBC_2.38 pthread_mutexattr_destroy F
 GLIBC_2.38 pthread_mutexattr_getprioceiling F
 GLIBC_2.38 pthread_mutexattr_getprotocol F
 GLIBC_2.38 pthread_mutexattr_getpshared F