htl: move pthread_mutexattr_setprioceiling, pthread_mutexattr_getprioceiling into...

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

diff --git a/htl/Makefile b/htl/Makefile
index a46dcff204f725a357de990d3fd5edd8104c49fe..551d4c01d3205025c4f961d32c58af99740d7cb1 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -54,8 +54,6 @@ libpthread-routines := \
   pt-setcanceltype \
   pt-testcancel \
   pt-cancel \
-  pt-mutexattr-getprioceiling \
-  pt-mutexattr-setprioceiling \
   pt-mutex-init \
   pt-mutex-destroy \
   pt-mutex-lock \
@@ -192,11 +190,13 @@ routines := \
   pt-getschedparam \
   pt-mutex-checklocked \
   pt-mutexattr-destroy \
+  pt-mutexattr-getprioceiling \
   pt-mutexattr-getprotocol \
   pt-mutexattr-getpshared \
   pt-mutexattr-getrobust \
   pt-mutexattr-gettype \
   pt-mutexattr-init \
+  pt-mutexattr-setprioceiling \
   pt-mutexattr-setprotocol \
   pt-mutexattr-setpshared \
   pt-mutexattr-setrobust \

diff --git a/htl/Versions b/htl/Versions
index 42e3ebebf04248fc4bf73f3588a7bb302b6eefa1..f1393ebe34611a9aceb9d90d812b7cfe5eaecd8f 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -39,10 +39,12 @@ libc {
     pthread_condattr_setclock;
     pthread_condattr_setpshared;
     pthread_mutexattr_destroy;
+    pthread_mutexattr_getprioceiling;
     pthread_mutexattr_getprotocol;
     pthread_mutexattr_getpshared;
     pthread_mutexattr_gettype;
     pthread_mutexattr_init;
+    pthread_mutexattr_setprioceiling;
     pthread_mutexattr_setprotocol;
     pthread_mutexattr_setpshared;
     pthread_mutexattr_settype;
@@ -94,10 +96,12 @@ libc {
     pthread_condattr_getpshared;
     pthread_condattr_setclock;
     pthread_condattr_setpshared;
+    pthread_mutexattr_getprioceiling;
     pthread_mutexattr_getprotocol;
     pthread_mutexattr_getpshared;
     pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np;
     pthread_mutexattr_gettype;
+    pthread_mutexattr_setprioceiling;
     pthread_mutexattr_setprotocol;
     pthread_mutexattr_setpshared;
     pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np;
@@ -196,9 +200,6 @@ libpthread {
     pthread_mutex_timedlock; pthread_mutex_transfer_np;
     pthread_mutex_trylock; pthread_mutex_unlock;
 
-    pthread_mutexattr_getprioceiling;
-    pthread_mutexattr_setprioceiling;
-
     pthread_once;
 
     pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock;

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index d08a0ca7ddbf9cbb7126c2b91d5ed284ab928dd6..20dd5a1cc5552503ed133f2d83af52a5a697eb47 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -62,6 +62,13 @@ extern int __pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr,
                                        int __robustness);
 libc_hidden_proto (__pthread_mutexattr_setrobust)
 
+extern int __pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *__restrict __attr,
+                                           int *__restrict __prioceiling);
+libc_hidden_proto (__pthread_mutexattr_getprioceiling)
+extern int __pthread_mutexattr_setprioceiling(pthread_mutexattr_t *__attr,
+                                           int __prioceiling);
+libc_hidden_proto (__pthread_mutexattr_setprioceiling)
+
 extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr,
                                         int *__restrict __protocol);
 libc_hidden_proto (__pthread_mutexattr_getprotocol)

diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c
index 8848287a45097e0d19cdf37dece8b5312d6c5bee..cb462518683e32465c9426fd126664a01352b7d3 100644 (file)
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-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_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp)
+__pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp)
 {
   (void) ap;
   (void) clp;
   return ENOSYS;
 }
+libc_hidden_def (__pthread_mutexattr_getprioceiling)
+versioned_symbol (libc, __pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling, GLIBC_2_41);
 
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_mutexattr_getprioceiling,pthread_mutexattr_getprioceiling, GLIBC_2_12);
+#endif
 stub_warning (pthread_mutexattr_getprioceiling)

diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c
index a15593ac1bb24bd8788c5e2a1022c2172e726dce..8515235d88d6c10d1f2fe4f9a3d6972c9dd5f724 100644 (file)
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.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_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl)
+__pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl)
 {
   (void) attrp;
   (void) cl;
   return ENOSYS;
 }
+libc_hidden_def (__pthread_mutexattr_setprioceiling)
+versioned_symbol (libc, __pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling, GLIBC_2_41);
 
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_mutexattr_setprioceiling,pthread_mutexattr_setprioceiling, GLIBC_2_12);
+#endif
 stub_warning (pthread_mutexattr_setprioceiling)

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 8e364b14c67477c8a476e5ac677a56b77c5914a0..40f35ee047a9871d2897901dd49a54718e5f253a 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -64,10 +64,12 @@ 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_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_init F
+GLIBC_2.12 pthread_mutexattr_setprioceiling F
 GLIBC_2.12 pthread_mutexattr_setprotocol F
 GLIBC_2.12 pthread_mutexattr_setpshared F
 GLIBC_2.12 pthread_mutexattr_settype F
@@ -2533,11 +2535,13 @@ 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_getprioceiling F
 GLIBC_2.41 pthread_mutexattr_getprotocol F
 GLIBC_2.41 pthread_mutexattr_getpshared F
 GLIBC_2.41 pthread_mutexattr_getrobust F
 GLIBC_2.41 pthread_mutexattr_getrobust_np F
 GLIBC_2.41 pthread_mutexattr_gettype F
+GLIBC_2.41 pthread_mutexattr_setprioceiling F
 GLIBC_2.41 pthread_mutexattr_setprotocol F
 GLIBC_2.41 pthread_mutexattr_setpshared F
 GLIBC_2.41 pthread_mutexattr_setrobust F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index bc48c0023de835f43dde1628986665aa5668f79d..b925871a0bf2906ad6648702c576d35a2af80be2 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -50,8 +50,6 @@ GLIBC_2.12 pthread_mutex_timedlock F
 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_setprioceiling F
 GLIBC_2.12 pthread_once F
 GLIBC_2.12 pthread_rwlock_destroy F
 GLIBC_2.12 pthread_rwlock_init F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 05a4a8cf2828bd2d1636fc58b64f71b3dbc35dab..aaf55cbaf4e92e2bd1a0bba7cd0e3ed0d754f6d2 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1552,12 +1552,14 @@ 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_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
 GLIBC_2.38 pthread_mutexattr_gettype F
 GLIBC_2.38 pthread_mutexattr_init F
+GLIBC_2.38 pthread_mutexattr_setprioceiling F
 GLIBC_2.38 pthread_mutexattr_setprotocol F
 GLIBC_2.38 pthread_mutexattr_setpshared F
 GLIBC_2.38 pthread_mutexattr_setrobust F
@@ -2222,11 +2224,13 @@ 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_getprioceiling F
 GLIBC_2.41 pthread_mutexattr_getprotocol F
 GLIBC_2.41 pthread_mutexattr_getpshared F
 GLIBC_2.41 pthread_mutexattr_getrobust F
 GLIBC_2.41 pthread_mutexattr_getrobust_np F
 GLIBC_2.41 pthread_mutexattr_gettype F
+GLIBC_2.41 pthread_mutexattr_setprioceiling F
 GLIBC_2.41 pthread_mutexattr_setprotocol F
 GLIBC_2.41 pthread_mutexattr_setpshared F
 GLIBC_2.41 pthread_mutexattr_setrobust F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index b382b4843acaf4e5e4f8fdf142f77ca5ee0b7342..608901fb0014785849846cc96451bcd9e992067a 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -73,8 +73,6 @@ GLIBC_2.38 pthread_mutex_timedlock F
 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_setprioceiling F
 GLIBC_2.38 pthread_once F
 GLIBC_2.38 pthread_rwlock_clockrdlock F
 GLIBC_2.38 pthread_rwlock_clockwrlock F