htl: move pthread_mutexattr_{setrobust, setrobust_np}, pthread_mutexattr_{getrobust...

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

diff --git a/htl/Makefile b/htl/Makefile
index ed2c32e2be250dd95d38969507af95015b917e18..a46dcff204f725a357de990d3fd5edd8104c49fe 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -56,8 +56,6 @@ libpthread-routines := \
   pt-cancel \
   pt-mutexattr-getprioceiling \
   pt-mutexattr-setprioceiling \
-  pt-mutexattr-getrobust \
-  pt-mutexattr-setrobust \
   pt-mutex-init \
   pt-mutex-destroy \
   pt-mutex-lock \
@@ -196,10 +194,12 @@ routines := \
   pt-mutexattr-destroy \
   pt-mutexattr-getprotocol \
   pt-mutexattr-getpshared \
+  pt-mutexattr-getrobust \
   pt-mutexattr-gettype \
   pt-mutexattr-init \
   pt-mutexattr-setprotocol \
   pt-mutexattr-setpshared \
+  pt-mutexattr-setrobust \
   pt-mutexattr-settype \
   pt-nthreads \
   pt-pthread_self \

diff --git a/htl/Versions b/htl/Versions
index cb308820e381b4f468963a061056df9d8ff10fa6..42e3ebebf04248fc4bf73f3588a7bb302b6eefa1 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -76,6 +76,9 @@ libc {
     thrd_current; thrd_equal; thrd_sleep; thrd_yield;
 
     pthread_cond_clockwait;
+
+    pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np;
+    pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np;
   }
 
   GLIBC_2.41 {
@@ -93,9 +96,11 @@ libc {
     pthread_condattr_setpshared;
     pthread_mutexattr_getprotocol;
     pthread_mutexattr_getpshared;
+    pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np;
     pthread_mutexattr_gettype;
     pthread_mutexattr_setprotocol;
     pthread_mutexattr_setpshared;
+    pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np;
     pthread_mutexattr_settype;
     pthread_sigmask;
   }
@@ -233,9 +238,6 @@ libpthread {
     cnd_broadcast; cnd_destroy; cnd_init; cnd_signal; cnd_timedwait; cnd_wait;
     tss_create; tss_delete; tss_get; tss_set;
 
-    pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np;
-    pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np;
-
     pthread_mutex_consistent; pthread_mutex_consistent_np;
     pthread_mutex_clocklock;
 

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index b5ff56227ba8e51ecf3a51ff8ea08b854f0c2519..d08a0ca7ddbf9cbb7126c2b91d5ed284ab928dd6 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -46,6 +46,22 @@ extern int __pthread_mutexattr_setpshared(pthread_mutexattr_t *__attr,
                                        int __pshared);
 libc_hidden_proto (__pthread_mutexattr_setpshared)
 
+/* Get the robustness flag of the mutex attribute ATTR.  */
+extern int __pthread_mutexattr_getrobust (const pthread_mutexattr_t *__attr,
+                                       int *__robustness);
+libc_hidden_proto (__pthread_mutexattr_getrobust)
+extern int __pthread_mutexattr_getrobust_np (const pthread_mutexattr_t *__attr,
+                                          int *__robustness);
+libc_hidden_proto (__pthread_mutexattr_getrobust_np)
+extern int __pthread_mutexattr_setrobust_np (pthread_mutexattr_t *__attr,
+                                          int __robustness);
+libc_hidden_proto (__pthread_mutexattr_setrobust_np)
+
+/* Set the robustness flag of the mutex attribute ATTR.  */
+extern int __pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr,
+                                       int __robustness);
+libc_hidden_proto (__pthread_mutexattr_setrobust)
+
 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-getrobust.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c
index fa14b88dfc18dec10de4fe896d40e6df0bcab0ea..6915ac79d68a1f5737bfd8c9f951bf89577308ad 100644 (file)
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c
@@ -16,19 +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_mutexattr_getrobust (const pthread_mutexattr_t *attrp, int *outp)
+__pthread_mutexattr_getrobust (const pthread_mutexattr_t *attrp, int *outp)
 {
   *outp = ((attrp->__prioceiling & PTHREAD_MUTEX_ROBUST)
           ? PTHREAD_MUTEX_ROBUST : PTHREAD_MUTEX_STALLED);
   return 0;
 }
+libc_hidden_def (__pthread_mutexattr_getrobust)
+versioned_symbol (libc, __pthread_mutexattr_getrobust, pthread_mutexattr_getrobust, GLIBC_2_41);
+versioned_symbol (libc, __pthread_mutexattr_getrobust, pthread_mutexattr_getrobust_np, GLIBC_2_41);
 
-weak_alias (pthread_mutexattr_getrobust, pthread_mutexattr_getrobust_np)
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_32, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_mutexattr_getrobust,pthread_mutexattr_getrobust, GLIBC_2_32);
+compat_symbol (libpthread, __pthread_mutexattr_getrobust,pthread_mutexattr_getrobust_np, GLIBC_2_32);
+#endif

diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c
index 6bba0df68b24d69b04d50a2977ff77a04d19c677..8d90814174fcc64c08699bcb62d2683aa6afb9d2 100644 (file)
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c
@@ -16,15 +16,16 @@
    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_setrobust (pthread_mutexattr_t *attrp, int robust)
+__pthread_mutexattr_setrobust (pthread_mutexattr_t *attrp, int robust)
 {
   if (robust != PTHREAD_MUTEX_ROBUST && robust != PTHREAD_MUTEX_STALLED)
     return EINVAL;
@@ -32,5 +33,11 @@ pthread_mutexattr_setrobust (pthread_mutexattr_t *attrp, int robust)
   attrp->__prioceiling |= robust;
   return 0;
 }
+libc_hidden_def (__pthread_mutexattr_setrobust)
+versioned_symbol (libc, __pthread_mutexattr_setrobust, pthread_mutexattr_setrobust, GLIBC_2_41);
+versioned_symbol (libc, __pthread_mutexattr_setrobust, pthread_mutexattr_setrobust_np, GLIBC_2_41);
 
-weak_alias (pthread_mutexattr_setrobust, pthread_mutexattr_setrobust_np)
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_32, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_mutexattr_setrobust,pthread_mutexattr_setrobust, GLIBC_2_32);
+compat_symbol (libpthread, __pthread_mutexattr_setrobust,pthread_mutexattr_setrobust_np, GLIBC_2_32);
+#endif

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 45147cae6f3b9495c8c0266c1e2c515e7f14c0e5..8e364b14c67477c8a476e5ac677a56b77c5914a0 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -2261,6 +2261,10 @@ GLIBC_2.32 __libc_single_threaded D 0x1
 GLIBC_2.32 mach_print F
 GLIBC_2.32 mremap F
 GLIBC_2.32 pthread_cond_clockwait F
+GLIBC_2.32 pthread_mutexattr_getrobust F
+GLIBC_2.32 pthread_mutexattr_getrobust_np F
+GLIBC_2.32 pthread_mutexattr_setrobust F
+GLIBC_2.32 pthread_mutexattr_setrobust_np F
 GLIBC_2.32 sigabbrev_np F
 GLIBC_2.32 sigdescr_np F
 GLIBC_2.32 strerrordesc_np F
@@ -2531,9 +2535,13 @@ 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_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_setprotocol F
 GLIBC_2.41 pthread_mutexattr_setpshared F
+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.5 __readlinkat_chk F

diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index cf6b71a00f72f8f2e639d24e0bad29ca40f3338f..bc48c0023de835f43dde1628986665aa5668f79d 100644 (file)
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -112,10 +112,6 @@ GLIBC_2.32 pthread_clockjoin_np F
 GLIBC_2.32 pthread_mutex_clocklock F
 GLIBC_2.32 pthread_mutex_consistent F
 GLIBC_2.32 pthread_mutex_consistent_np F
-GLIBC_2.32 pthread_mutexattr_getrobust F
-GLIBC_2.32 pthread_mutexattr_getrobust_np F
-GLIBC_2.32 pthread_mutexattr_setrobust F
-GLIBC_2.32 pthread_mutexattr_setrobust_np F
 GLIBC_2.32 pthread_rwlock_clockrdlock F
 GLIBC_2.32 pthread_rwlock_clockwrlock F
 GLIBC_2.32 pthread_timedjoin_np F

diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 0e9ff2db96e5b8f8bb4a67bc7042971e1da7ff76..05a4a8cf2828bd2d1636fc58b64f71b3dbc35dab 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1554,10 +1554,14 @@ 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_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_setprotocol F
 GLIBC_2.38 pthread_mutexattr_setpshared F
+GLIBC_2.38 pthread_mutexattr_setrobust F
+GLIBC_2.38 pthread_mutexattr_setrobust_np F
 GLIBC_2.38 pthread_mutexattr_settype F
 GLIBC_2.38 pthread_self F
 GLIBC_2.38 pthread_setcancelstate F
@@ -2220,9 +2224,13 @@ 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_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_setprotocol F
 GLIBC_2.41 pthread_mutexattr_setpshared F
+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
 HURD_CTHREADS_0.3 __cthread_getspecific F

diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 866890caa6a129befd56201a2cabeb2b38daed70..b382b4843acaf4e5e4f8fdf142f77ca5ee0b7342 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -74,11 +74,7 @@ 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_getrobust F
-GLIBC_2.38 pthread_mutexattr_getrobust_np F
 GLIBC_2.38 pthread_mutexattr_setprioceiling F
-GLIBC_2.38 pthread_mutexattr_setrobust F
-GLIBC_2.38 pthread_mutexattr_setrobust_np F
 GLIBC_2.38 pthread_once F
 GLIBC_2.38 pthread_rwlock_clockrdlock F
 GLIBC_2.38 pthread_rwlock_clockwrlock F