From: gfleury <[email protected]>
Message-ID: <[email protected]>
---
htl/Makefile | 4 ++--
htl/Versions | 8 +++++---
sysdeps/htl/pthreadP.h | 16 ++++++++++++++++
sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c | 13 ++++++++++---
sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c | 13 ++++++++++---
sysdeps/mach/hurd/i386/libc.abilist | 8 ++++++++
sysdeps/mach/hurd/i386/libpthread.abilist | 4 ----
sysdeps/mach/hurd/x86_64/libc.abilist | 8 ++++++++
sysdeps/mach/hurd/x86_64/libpthread.abilist | 4 ----
9 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/htl/Makefile b/htl/Makefile
index ed2c32e2be..a46dcff204 100644
--- 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 cb308820e3..42e3ebebf0 100644
--- 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 b5ff56227b..d08a0ca7dd 100644
--- 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 fa14b88dfc..6915ac79d6 100644
--- 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 6bba0df68b..8d90814174 100644
--- 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 45147cae6f..8e364b14c6 100644
--- 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 cf6b71a00f..bc48c0023d 100644
--- 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 0e9ff2db96..05a4a8cf28 100644
--- 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 866890caa6..b382b4843a 100644
--- 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
--
2.45.2
