htl: move pthread_mutexattr_getprotocol into libc.

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

8 files changed, 20 insertions, 6 deletions

diff --git a/htl/Makefile b/htl/Makefile
index e2b22af..c4c9dc0 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -55,7 +55,6 @@ libpthread-routines := \
   pt-testcancel \
   pt-cancel \
   pt-mutexattr-getprioceiling \
-  pt-mutexattr-getprotocol \
   pt-mutexattr-getpshared \
   pt-mutexattr-gettype \
   pt-mutexattr-setprioceiling \
@@ -200,6 +199,7 @@ routines := \
   pt-getschedparam \
   pt-mutex-checklocked \
   pt-mutexattr-destroy \
+  pt-mutexattr-getprotocol \
   pt-mutexattr-init \
   pt-nthreads \
   pt-pthread_self \
diff --git a/htl/Versions b/htl/Versions
index d3ee842..61c3b9a 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -39,6 +39,7 @@ libc {
     pthread_condattr_setclock;
     pthread_condattr_setpshared;
     pthread_mutexattr_destroy;
+    pthread_mutexattr_getprotocol;
     pthread_mutexattr_init;
     pthread_sigmask;
   }
@@ -85,6 +86,7 @@ libc {
     pthread_condattr_getpshared;
     pthread_condattr_setclock;
     pthread_condattr_setpshared;
+    pthread_mutexattr_getprotocol;
     pthread_sigmask;
   }
 
@@ -179,7 +181,7 @@ libpthread {
     pthread_mutex_trylock; pthread_mutex_unlock;
 
     pthread_mutexattr_getprioceiling;
-    pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared;
+    pthread_mutexattr_getpshared;
     pthread_mutexattr_gettype;
     pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol;
     pthread_mutexattr_setpshared; pthread_mutexattr_settype;
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index b32c41b..9798fcb 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -40,6 +40,9 @@ extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex,
 extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
 extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind);
 
+extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr,
+					 int *__restrict __protocol);
+libc_hidden_proto (__pthread_mutexattr_getprotocol)
 extern int __pthread_cond_init (pthread_cond_t *cond,
 				const pthread_condattr_t *cond_attr);
 libc_hidden_proto (__pthread_cond_init)
diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c
index 7be7bbd..79aac54 100644
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c
@@ -16,16 +16,23 @@
    License along with the GNU C Library;  if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <pthread.h>
+#include <pthreadP.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <shlib-compat.h>
 
 int
-pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attrp, int *ptp)
+__pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attrp, int *ptp)
 {
   *ptp = attrp->__protocol;
   return 0;
 }
+libc_hidden_def (__pthread_mutexattr_getprotocol)
+versioned_symbol (libc, __pthread_mutexattr_getprotocol, pthread_mutexattr_getprotocol, GLIBC_2_41);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_mutexattr_getprotocol,pthread_mutexattr_getprotocol, GLIBC_2_12);
+#endif
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 69af145..4289853 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -64,6 +64,7 @@ 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_getprotocol F
 GLIBC_2.12 pthread_mutexattr_init F
 GLIBC_2.12 pthread_self F
 GLIBC_2.12 pthread_setschedparam F
@@ -2523,6 +2524,7 @@ GLIBC_2.41 pthread_condattr_getclock F
 GLIBC_2.41 pthread_condattr_getpshared F
 GLIBC_2.41 pthread_condattr_setclock F
 GLIBC_2.41 pthread_condattr_setpshared F
+GLIBC_2.41 pthread_mutexattr_getprotocol F
 GLIBC_2.41 pthread_sigmask 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 0fd3e53..b53ca95 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -51,7 +51,6 @@ 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_getprioceiling F
-GLIBC_2.12 pthread_mutexattr_getprotocol F
 GLIBC_2.12 pthread_mutexattr_getpshared F
 GLIBC_2.12 pthread_mutexattr_gettype F
 GLIBC_2.12 pthread_mutexattr_setprioceiling F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 52e698f..667c96e 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1552,6 +1552,7 @@ 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_getprotocol F
 GLIBC_2.38 pthread_mutexattr_init F
 GLIBC_2.38 pthread_self F
 GLIBC_2.38 pthread_setcancelstate F
@@ -2212,6 +2213,7 @@ GLIBC_2.41 pthread_condattr_getclock F
 GLIBC_2.41 pthread_condattr_getpshared F
 GLIBC_2.41 pthread_condattr_setclock F
 GLIBC_2.41 pthread_condattr_setpshared F
+GLIBC_2.41 pthread_mutexattr_getprotocol F
 GLIBC_2.41 pthread_sigmask 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 90ea26b..24becc5 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -74,7 +74,6 @@ 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_getprioceiling F
-GLIBC_2.38 pthread_mutexattr_getprotocol F
 GLIBC_2.38 pthread_mutexattr_getpshared F
 GLIBC_2.38 pthread_mutexattr_getrobust F
 GLIBC_2.38 pthread_mutexattr_getrobust_np F