htl: move pthread_mutex_init into libc.

Message-ID: <20250103103750.870897-2-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 551d4c01d3205025c4f961d32c58af99740d7cb1..f381499ff71eae5a6d1cf4905c360d2995184e85 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -54,7 +54,6 @@ libpthread-routines := \
   pt-setcanceltype \
   pt-testcancel \
   pt-cancel \
-  pt-mutex-init \
   pt-mutex-destroy \
   pt-mutex-lock \
   pt-mutex-trylock \
@@ -189,6 +188,7 @@ routines := \
   pt-condattr-setpshared \
   pt-getschedparam \
   pt-mutex-checklocked \
+  pt-mutex-init \
   pt-mutexattr-destroy \
   pt-mutexattr-getprioceiling \
   pt-mutexattr-getprotocol \

diff --git a/htl/Versions b/htl/Versions
index f1393ebe34611a9aceb9d90d812b7cfe5eaecd8f..caa5653e6cb80a4350d34650864d4eab6609f141 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -38,6 +38,7 @@ libc {
     pthread_condattr_getpshared;
     pthread_condattr_setclock;
     pthread_condattr_setpshared;
+    pthread_mutex_init;
     pthread_mutexattr_destroy;
     pthread_mutexattr_getprioceiling;
     pthread_mutexattr_getprotocol;
@@ -137,6 +138,7 @@ libc {
     __pthread_condattr_init;
     __pthread_default_condattr;
     __pthread_mutex_checklocked;
+    __pthread_mutex_init;
     __pthread_mutexattr_destroy;
     __pthread_mutexattr_init;
     __pthread_mutexattr_settype;
@@ -196,7 +198,7 @@ libpthread {
     __pthread_kill;
 
     pthread_mutex_destroy; pthread_mutex_getprioceiling;
-    pthread_mutex_init; pthread_mutex_lock; pthread_mutex_setprioceiling;
+    pthread_mutex_lock; pthread_mutex_setprioceiling;
     pthread_mutex_timedlock; pthread_mutex_transfer_np;
     pthread_mutex_trylock; pthread_mutex_unlock;
 
@@ -267,7 +269,6 @@ libpthread {
     __pthread_getspecific;
     __pthread_setspecific;
     __pthread_getattr_np;
-    __pthread_mutex_init;
     __pthread_mutex_destroy;
     __pthread_mutex_timedlock;
     __pthread_enable_asynccancel;

diff --git a/htl/forward.c b/htl/forward.c
index 2b699c2572d9b3fe08f37f6a741c6d22fd687d7b..e78637567f00e3ed544e00221869b1a49ef2f50d 100644 (file)
--- 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_init,
-        (pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr),
-        (mutex, mutexattr), 0)
-
 FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0)
 
 FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0)

diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c
index a2332776be328a2043d890baa1af8bdf549fc530..606a085dd030b896c1ca0f0f9d11d5fadd3bba76 100644 (file)
--- a/htl/pt-initialize.c
+++ b/htl/pt-initialize.c
@@ -29,7 +29,6 @@
 static const struct pthread_functions pthread_functions = {
   .ptr___pthread_exit = __pthread_exit,
   .ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
-  .ptr_pthread_mutex_init = __pthread_mutex_init,
   .ptr_pthread_mutex_lock = __pthread_mutex_lock,
   .ptr_pthread_mutex_trylock = __pthread_mutex_trylock,
   .ptr_pthread_mutex_unlock = __pthread_mutex_unlock,

diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h
index 30801f935f47b2c6392b5e25c0cf5d465fae13c3..6c13382a21a389391dc49016252ca49e3fb52fba 100644 (file)
--- a/sysdeps/htl/libc-lockP.h
+++ b/sysdeps/htl/libc-lockP.h
@@ -117,7 +117,6 @@ extern int __pthread_atfork (void (*__prepare) (void),
    single-threaded processes.  */
 #if !defined(__NO_WEAK_PTHREAD_ALIASES) && !IS_IN (libpthread)
 # ifdef weak_extern
-weak_extern (__pthread_mutex_init)
 weak_extern (__pthread_mutex_destroy)
 weak_extern (__pthread_mutex_lock)
 weak_extern (__pthread_mutex_trylock)
@@ -137,7 +136,6 @@ weak_extern (__pthread_initialize)
 weak_extern (__pthread_atfork)
 weak_extern (__pthread_setcancelstate)
 # else
-#  pragma weak __pthread_mutex_init
 #  pragma weak __pthread_mutex_destroy
 #  pragma weak __pthread_mutex_lock
 #  pragma weak __pthread_mutex_trylock

diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h
index 97f42933676cb085594b831e28c21705a3dcfe72..54b773344dacd6de3e81ee1ed8d0f2d555decb54 100644 (file)
--- a/sysdeps/htl/pthread-functions.h
+++ b/sysdeps/htl/pthread-functions.h
@@ -23,8 +23,6 @@
 
 void __pthread_exit (void *) __attribute__ ((__noreturn__));
 int _pthread_mutex_destroy (pthread_mutex_t *);
-int _pthread_mutex_init (pthread_mutex_t *,
-                        const pthread_mutexattr_t *);
 int __pthread_mutex_lock (pthread_mutex_t *);
 int __pthread_mutex_trylock (pthread_mutex_t *);
 int __pthread_mutex_unlock (pthread_mutex_t *);
@@ -50,8 +48,6 @@ struct pthread_functions
 {
   void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
   int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
-  int (*ptr_pthread_mutex_init) (pthread_mutex_t *,
-                                const pthread_mutexattr_t *);
   int (*ptr_pthread_mutex_lock) (pthread_mutex_t *);
   int (*ptr_pthread_mutex_trylock) (pthread_mutex_t *);
   int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *);

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 58bcd93006b1954cb4c7a8126f9175f19d6c8dbc..bb17391cb3df55d6f043c696e8dfc29264c6ead3 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -32,6 +32,7 @@ extern void __pthread_init_static_tls (struct link_map *) attribute_hidden;
 /* These represent the interface used by glibc itself.  */
 
 extern int __pthread_mutex_init (pthread_mutex_t *__mutex, const pthread_mutexattr_t *__attr);
+libc_hidden_proto (__pthread_mutex_init)
 extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
 extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
 extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex);
@@ -162,7 +163,6 @@ hidden_proto (__pthread_detach)
 hidden_proto (__pthread_key_create)
 hidden_proto (__pthread_getspecific)
 hidden_proto (__pthread_setspecific)
-hidden_proto (__pthread_mutex_init)
 hidden_proto (__pthread_mutex_destroy)
 hidden_proto (__pthread_mutex_lock)
 hidden_proto (__pthread_mutex_trylock)

diff --git a/sysdeps/htl/timer_routines.c b/sysdeps/htl/timer_routines.c
index 2e019182ab8011ef54bf905b979dc96243b4616e..2039e0ba2ec7134798a547f9d155196e2fbc3308 100644 (file)
--- a/sysdeps/htl/timer_routines.c
+++ b/sysdeps/htl/timer_routines.c
@@ -191,7 +191,7 @@ static void
 reinit_after_fork (void)
 {
   init_module ();
-  pthread_mutex_init (&__timer_mutex, 0);
+  __pthread_mutex_init (&__timer_mutex, 0);
 }
 
 

diff --git a/sysdeps/mach/hurd/htl/pt-mutex-init.c b/sysdeps/mach/hurd/htl/pt-mutex-init.c
index aa8b9cec40c1e5ba18611b643a075eb7742b97ea..6fb5d361960f0b5151c036d189d7a056da9533bb 100644 (file)
--- a/sysdeps/mach/hurd/htl/pt-mutex-init.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-init.c
@@ -23,6 +23,7 @@
 #include <pthreadP.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <shlib-compat.h>
 
 static const pthread_mutexattr_t dfl_attr = {
   .__prioceiling = 0,
@@ -54,6 +55,9 @@ __pthread_mutex_init (pthread_mutex_t *mtxp, const pthread_mutexattr_t *attrp)
 
   return 0;
 }
+libc_hidden_def (__pthread_mutex_init)
+versioned_symbol (libc, __pthread_mutex_init, pthread_mutex_init, GLIBC_2_21);
 
-weak_alias (__pthread_mutex_init, pthread_mutex_init)
-hidden_def (__pthread_mutex_init)
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
+compat_symbol (libc, __pthread_mutex_init, pthread_mutex_init, GLIBC_2_12);
+#endif

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 40f35ee047a9871d2897901dd49a54718e5f253a..e9559bd265fe3a7214ebca3357962b5d56a2add5 100644 (file)
--- 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_mutex_init F
 GLIBC_2.12 pthread_mutexattr_destroy F
 GLIBC_2.12 pthread_mutexattr_getprioceiling F
 GLIBC_2.12 pthread_mutexattr_getprotocol F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index b925871a0bf2906ad6648702c576d35a2af80be2..6b330744bb364ea890c351e76c1f26b71af7af73 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -43,7 +43,6 @@ GLIBC_2.12 pthread_key_delete F
 GLIBC_2.12 pthread_kill F
 GLIBC_2.12 pthread_mutex_destroy F
 GLIBC_2.12 pthread_mutex_getprioceiling F
-GLIBC_2.12 pthread_mutex_init F
 GLIBC_2.12 pthread_mutex_lock F
 GLIBC_2.12 pthread_mutex_setprioceiling F
 GLIBC_2.12 pthread_mutex_timedlock F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 608901fb0014785849846cc96451bcd9e992067a..047d685a78c40ce2ffdc3d44b292571814182a9d 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -66,7 +66,6 @@ GLIBC_2.38 pthread_mutex_consistent F
 GLIBC_2.38 pthread_mutex_consistent_np F
 GLIBC_2.38 pthread_mutex_destroy F
 GLIBC_2.38 pthread_mutex_getprioceiling F
-GLIBC_2.38 pthread_mutex_init F
 GLIBC_2.38 pthread_mutex_lock F
 GLIBC_2.38 pthread_mutex_setprioceiling F
 GLIBC_2.38 pthread_mutex_timedlock F