htl: move pthread_mutex_{lock, unlock, trylock, timedlock, clocklock}

I haven't exposed _pthread_mutex_lock,  _pthread_mutex_trylock and
_pthread_mutex_unlock in GLIBC_PRIVATE since there aren't used in any
code in libpthread
Message-ID: <20250103103750.870897-3-gfleury@disroot.org>

4 files changed, 20 insertions, 20 deletions

diff --git a/htl/Makefile b/htl/Makefile
index f381499ff7..0d3e78dee5 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -55,10 +55,6 @@ libpthread-routines := \
   pt-testcancel \
   pt-cancel \
   pt-mutex-destroy \
-  pt-mutex-lock \
-  pt-mutex-trylock \
-  pt-mutex-timedlock \
-  pt-mutex-unlock \
   pt-mutex-transfer-np \
   pt-mutex-getprioceiling \
   pt-mutex-setprioceiling \
@@ -189,6 +185,10 @@ routines := \
   pt-getschedparam \
   pt-mutex-checklocked \
   pt-mutex-init \
+  pt-mutex-lock \
+  pt-mutex-timedlock \
+  pt-mutex-trylock \
+  pt-mutex-unlock \
   pt-mutexattr-destroy \
   pt-mutexattr-getprioceiling \
   pt-mutexattr-getprotocol \
diff --git a/htl/Versions b/htl/Versions
index caa5653e6c..757cefef61 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -39,6 +39,10 @@ libc {
     pthread_condattr_setclock;
     pthread_condattr_setpshared;
     pthread_mutex_init;
+    pthread_mutex_lock;
+    pthread_mutex_timedlock;
+    pthread_mutex_trylock;
+    pthread_mutex_unlock;
     pthread_mutexattr_destroy;
     pthread_mutexattr_getprioceiling;
     pthread_mutexattr_getprotocol;
@@ -66,7 +70,7 @@ libc {
     pthread_equal;
     pthread_exit; pthread_getschedparam; pthread_setschedparam;
     pthread_mutex_destroy; pthread_mutex_init;
-    pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock;
+    pthread_mutex_lock; pthread_mutex_unlock;
     pthread_self; pthread_setcancelstate; pthread_setcanceltype;
     __pthread_get_cleanup_stack;
   }
@@ -80,6 +84,8 @@ libc {
 
     pthread_cond_clockwait;
 
+    pthread_mutex_clocklock;
+
     pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np;
     pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np;
   }
@@ -110,6 +116,9 @@ libc {
     pthread_sigmask;
   }
 
+  GLIBC_2.42 {
+    pthread_mutex_trylock;
+  }
 
   GLIBC_PRIVATE {
     __libc_alloca_cutoff;
@@ -139,6 +148,10 @@ libc {
     __pthread_default_condattr;
     __pthread_mutex_checklocked;
     __pthread_mutex_init;
+    __pthread_mutex_lock;
+    __pthread_mutex_timedlock;
+    __pthread_mutex_trylock;
+    __pthread_mutex_unlock;
     __pthread_mutexattr_destroy;
     __pthread_mutexattr_init;
     __pthread_mutexattr_settype;
@@ -198,9 +211,8 @@ libpthread {
     __pthread_kill;
 
     pthread_mutex_destroy; pthread_mutex_getprioceiling;
-    pthread_mutex_lock; pthread_mutex_setprioceiling;
-    pthread_mutex_timedlock; pthread_mutex_transfer_np;
-    pthread_mutex_trylock; pthread_mutex_unlock;
+    pthread_mutex_setprioceiling;
+    pthread_mutex_transfer_np;
 
     pthread_once;
 
@@ -242,7 +254,6 @@ libpthread {
     tss_create; tss_delete; tss_get; tss_set;
 
     pthread_mutex_consistent; pthread_mutex_consistent_np;
-    pthread_mutex_clocklock;
 
     pthread_rwlock_clockrdlock; pthread_rwlock_clockwrlock;
 
@@ -270,12 +281,8 @@ libpthread {
     __pthread_setspecific;
     __pthread_getattr_np;
     __pthread_mutex_destroy;
-    __pthread_mutex_timedlock;
     __pthread_enable_asynccancel;
     __pthread_disable_asynccancel;
-
-    __pthread_mutex_lock; __pthread_mutex_trylock; __pthread_mutex_unlock;
-    _pthread_mutex_lock; _pthread_mutex_trylock; _pthread_mutex_unlock;
     _pthread_rwlock_destroy; _pthread_rwlock_init;
   }
 }
diff --git a/htl/forward.c b/htl/forward.c
index e78637567f..b71099b82b 100644
--- a/htl/forward.c
+++ b/htl/forward.c
@@ -60,10 +60,6 @@ strong_alias (__pthread_exit, pthread_exit);
 
 FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0)
 
-FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0)
-
-FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0)
-
 FORWARD (__pthread_setcancelstate, (int state, int *oldstate),
 	 (state, oldstate), 0)
 strong_alias (__pthread_setcancelstate, pthread_setcancelstate);
diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index 606a085dd0..b8f8c95ce3 100644
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -29,9 +29,6 @@
 static const struct pthread_functions pthread_functions = {
   .ptr___pthread_exit = __pthread_exit,
   .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
-  .ptr_pthread_mutex_lock = __pthread_mutex_lock,
-  .ptr_pthread_mutex_trylock = __pthread_mutex_trylock,
-  .ptr_pthread_mutex_unlock = __pthread_mutex_unlock,
   .ptr___pthread_setcancelstate = __pthread_setcancelstate,
   .ptr_pthread_setcanceltype = __pthread_setcanceltype,
   .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack,