htl: move pthread_mutex_init into libc.

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

8 files changed, 9 insertions, 12 deletions

diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h
index 30801f935f..6c13382a21 100644
--- 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 97f4293367..54b773344d 100644
--- 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 58bcd93006..bb17391cb3 100644
--- 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 2e019182ab..2039e0ba2e 100644
--- 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 aa8b9cec40..6fb5d36196 100644
--- 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 40f35ee047..e9559bd265 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_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 b925871a0b..6b330744bb 100644
--- 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 608901fb00..047d685a78 100644
--- 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