htl: move pthread_mutex_getprioceiling, pthread_mutex_setprioceiling into libc

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

diff --git a/htl/Makefile b/htl/Makefile
index 0d3e78dee56d6e18614de68e8564de628ce30bd7..f7e12983d2c169d3108f7dca979d2e4e5a27ea2e 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -56,8 +56,6 @@ libpthread-routines := \
   pt-cancel \
   pt-mutex-destroy \
   pt-mutex-transfer-np \
-  pt-mutex-getprioceiling \
-  pt-mutex-setprioceiling \
   pt-mutex-consistent \
   pt-rwlock-attr \
   pt-rwlockattr-init \
@@ -184,8 +182,10 @@ routines := \
   pt-condattr-setpshared \
   pt-getschedparam \
   pt-mutex-checklocked \
+  pt-mutex-getprioceiling \
   pt-mutex-init \
   pt-mutex-lock \
+  pt-mutex-setprioceiling \
   pt-mutex-timedlock \
   pt-mutex-trylock \
   pt-mutex-unlock \

diff --git a/htl/Versions b/htl/Versions
index 757cefef61f71f84c3bd9a4ceb78a8f32a79a245..9c016bc6cf3d77d3685a3c2911080307fa58b891 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -38,8 +38,10 @@ libc {
     pthread_condattr_getpshared;
     pthread_condattr_setclock;
     pthread_condattr_setpshared;
+    pthread_mutex_getprioceiling;
     pthread_mutex_init;
     pthread_mutex_lock;
+    pthread_mutex_setprioceiling;
     pthread_mutex_timedlock;
     pthread_mutex_trylock;
     pthread_mutex_unlock;
@@ -117,6 +119,8 @@ libc {
   }
 
   GLIBC_2.42 {
+    pthread_mutex_getprioceiling;
+    pthread_mutex_setprioceiling;
     pthread_mutex_trylock;
   }
 
@@ -210,8 +214,7 @@ libpthread {
     pthread_kill;
     __pthread_kill;
 
-    pthread_mutex_destroy; pthread_mutex_getprioceiling;
-    pthread_mutex_setprioceiling;
+    pthread_mutex_destroy;
     pthread_mutex_transfer_np;
 
     pthread_once;

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index a2a0a932b7820a730d9bc58a6feeb85470bf7cd1..e41cb4c85d8ba7c9c0b6cf59961fcfe58807793f 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -39,6 +39,12 @@ libc_hidden_proto (__pthread_mutex_clocklock)
 extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
 extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
 libc_hidden_proto (__pthread_mutex_lock)
+extern int __pthread_mutex_getprioceiling (const pthread_mutex_t *__mutex,
+                                        int *__prioceiling);
+libc_hidden_proto (__pthread_mutex_getprioceiling)
+extern int __pthread_mutex_setprioceiling (pthread_mutex_t *__mutex,
+                                        int __prio, int *__oldprio);
+libc_hidden_proto (__pthread_mutex_setprioceiling)
 extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex);
 libc_hidden_proto (__pthread_mutex_trylock)
 extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex,

diff --git a/sysdeps/mach/hurd/htl/pt-mutex-getprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutex-getprioceiling.c
index 7a8feadce7b332284ff772803ad18d553de39eaa..27ea03ee608abc4d44b7de6676501b32b0aac1dc 100644 (file)
--- a/sysdeps/mach/hurd/htl/pt-mutex-getprioceiling.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-getprioceiling.c
@@ -16,19 +16,25 @@
    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_mutex_getprioceiling (const pthread_mutex_t *mtxp, int *clp)
+__pthread_mutex_getprioceiling (const pthread_mutex_t *mtxp, int *clp)
 {
   (void) mtxp;
   (void) clp;
   return ENOSYS;
 }
+libc_hidden_def (__pthread_mutex_getprioceiling)
+versioned_symbol (libc, __pthread_mutex_getprioceiling, pthread_mutex_getprioceiling, GLIBC_2_42);
 
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_mutex_getprioceiling,pthread_mutex_getprioceiling, GLIBC_2_12);
+#endif
 stub_warning (pthread_mutex_getprioceiling)

diff --git a/sysdeps/mach/hurd/htl/pt-mutex-setprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutex-setprioceiling.c
index 6ccce83340ed8e6624f5b0105e9ae20e4a9ee9a8..5064e2f5753278c1ff9416e08bb25f4283160b04 100644 (file)
--- a/sysdeps/mach/hurd/htl/pt-mutex-setprioceiling.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-setprioceiling.c
@@ -16,20 +16,26 @@
    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_mutex_setprioceiling (pthread_mutex_t *mtxp, int cl, int *prp)
+__pthread_mutex_setprioceiling (pthread_mutex_t *mtxp, int cl, int *prp)
 {
   (void) mtxp;
   (void) cl;
   (void) prp;
   return ENOSYS;
 }
+libc_hidden_def (__pthread_mutex_setprioceiling)
+versioned_symbol (libc, __pthread_mutex_setprioceiling, pthread_mutex_setprioceiling, GLIBC_2_42);
 
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_mutex_setprioceiling,pthread_mutex_setprioceiling, GLIBC_2_12);
+#endif
 stub_warning (pthread_mutex_setprioceiling)

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index aba93a281b41e8920ade65e76e3df5c1d3c03f5e..c980b46bca416489ab998587dc5f08da81cb139d 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -63,8 +63,10 @@ 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_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
 GLIBC_2.12 pthread_mutex_trylock F
 GLIBC_2.12 pthread_mutex_unlock F
@@ -2554,6 +2556,8 @@ GLIBC_2.41 pthread_mutexattr_setrobust F
 GLIBC_2.41 pthread_mutexattr_setrobust_np F
 GLIBC_2.41 pthread_mutexattr_settype F
 GLIBC_2.41 pthread_sigmask F
+GLIBC_2.42 pthread_mutex_getprioceiling F
+GLIBC_2.42 pthread_mutex_setprioceiling F
 GLIBC_2.42 pthread_mutex_trylock 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 8c53b8d0eea2c936c32c0bf4b8ffac1ff10128f9..0eb452eb0249394b00fd2bf9ce4f6115c4577330 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -42,8 +42,6 @@ GLIBC_2.12 pthread_key_create F
 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_setprioceiling F
 GLIBC_2.12 pthread_mutex_transfer_np F
 GLIBC_2.12 pthread_once F
 GLIBC_2.12 pthread_rwlock_destroy F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 2251371451ffdcc22322a4b541f7d09a99886d86..bdb89fb41d590e9bf1c4b601be202bee80d773fb 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1549,8 +1549,10 @@ GLIBC_2.38 pthread_exit F
 GLIBC_2.38 pthread_getschedparam F
 GLIBC_2.38 pthread_mutex_clocklock 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
 GLIBC_2.38 pthread_mutex_trylock F
 GLIBC_2.38 pthread_mutex_unlock F
@@ -2240,6 +2242,8 @@ GLIBC_2.41 pthread_mutexattr_setrobust F
 GLIBC_2.41 pthread_mutexattr_setrobust_np F
 GLIBC_2.41 pthread_mutexattr_settype F
 GLIBC_2.41 pthread_sigmask F
+GLIBC_2.42 pthread_mutex_getprioceiling F
+GLIBC_2.42 pthread_mutex_setprioceiling F
 GLIBC_2.42 pthread_mutex_trylock 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 bd5e12adcc5102e22b817044d481f26cbc54cadd..faeac21d940bdb0440cb5dd8238d4a81d7443c9c 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -64,8 +64,6 @@ GLIBC_2.38 pthread_kill F
 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_setprioceiling F
 GLIBC_2.38 pthread_mutex_transfer_np F
 GLIBC_2.38 pthread_once F
 GLIBC_2.38 pthread_rwlock_clockrdlock F