From: gfleury <[email protected]>
Message-ID: <[email protected]>
---
htl/Makefile | 2 +-
htl/Versions | 4 +++-
sysdeps/htl/pt-barrierattr-init.c | 9 ++++++++-
sysdeps/htl/pthreadP.h | 2 ++
sysdeps/mach/hurd/i386/libc.abilist | 2 ++
sysdeps/mach/hurd/i386/libpthread.abilist | 1 -
sysdeps/mach/hurd/x86_64/libc.abilist | 2 ++
sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 -
8 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/htl/Makefile b/htl/Makefile
index fc3c223943..7b2485471a 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -28,7 +28,6 @@ libpthread-routines := \
pt-barrier-destroy \
pt-barrier-init \
pt-barrier-wait \
- pt-barrierattr-init \
pt-barrierattr-getpshared \
pt-barrierattr-setpshared \
pt-destroy-specific \
@@ -161,6 +160,7 @@ routines := \
pt-attr-setstacksize \
pt-barrier \
pt-barrierattr-destroy \
+ pt-barrierattr-init \
pt-block \
pt-block-intr \
pt-cond \
diff --git a/htl/Versions b/htl/Versions
index 886ccb14c8..ccd2a6180b 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -27,6 +27,7 @@ libc {
pthread_attr_setschedparam;
pthread_attr_init;
pthread_barrierattr_destroy;
+ pthread_barrierattr_init;
pthread_cond_broadcast;
pthread_cond_destroy;
pthread_cond_init;
@@ -126,6 +127,7 @@ libc {
GLIBC_2.42 {
pthread_barrierattr_destroy;
+ pthread_barrierattr_init;
pthread_mutex_consistent; pthread_mutex_consistent_np;
pthread_mutex_getprioceiling;
pthread_mutex_setprioceiling;
@@ -206,7 +208,7 @@ libpthread {
pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait;
pthread_barrierattr_getpshared;
- pthread_barrierattr_init; pthread_barrierattr_setpshared;
+ pthread_barrierattr_setpshared;
pthread_cancel;
diff --git a/sysdeps/htl/pt-barrierattr-init.c
b/sysdeps/htl/pt-barrierattr-init.c
index 1d2f162b83..5a520bb989 100644
--- a/sysdeps/htl/pt-barrierattr-init.c
+++ b/sysdeps/htl/pt-barrierattr-init.c
@@ -18,12 +18,19 @@
#include <pthread.h>
#include <pt-internal.h>
+#include <shlib-compat.h>
int
-pthread_barrierattr_init (pthread_barrierattr_t *attr)
+__pthread_barrierattr_init (pthread_barrierattr_t *attr)
{
ASSERT_TYPE_SIZE (pthread_barrierattr_t, __SIZEOF_PTHREAD_BARRIERATTR_T);
*attr = __pthread_default_barrierattr;
return 0;
}
+libc_hidden_def (__pthread_barrierattr_init)
+versioned_symbol (libc, __pthread_barrierattr_init, pthread_barrierattr_init,
GLIBC_2_42);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42)
+compat_symbol (libpthread, __pthread_barrierattr_init,
pthread_barrierattr_init, GLIBC_2_12);
+#endif
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 68972b86c1..c7a6298290 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -33,6 +33,8 @@ extern void __pthread_init_static_tls (struct link_map *)
attribute_hidden;
extern int __pthread_barrierattr_destroy (pthread_barrierattr_t *__attr);
libc_hidden_proto (__pthread_barrierattr_destroy)
+extern int __pthread_barrierattr_init (pthread_barrierattr_t *__attr);
+libc_hidden_proto (__pthread_barrierattr_init)
extern int __pthread_mutex_init (pthread_mutex_t *__mutex, const
pthread_mutexattr_t *__attr);
libc_hidden_proto (__pthread_mutex_init)
extern int __pthread_mutex_clocklock (pthread_mutex_t *__mutex, clockid_t
__clockid,
diff --git a/sysdeps/mach/hurd/i386/libc.abilist
b/sysdeps/mach/hurd/i386/libc.abilist
index 72dfd665f6..eb141157db 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -50,6 +50,7 @@ GLIBC_2.12 pthread_attr_setstack F
GLIBC_2.12 pthread_attr_setstackaddr F
GLIBC_2.12 pthread_attr_setstacksize F
GLIBC_2.12 pthread_barrierattr_destroy F
+GLIBC_2.12 pthread_barrierattr_init F
GLIBC_2.12 pthread_cond_broadcast F
GLIBC_2.12 pthread_cond_destroy F
GLIBC_2.12 pthread_cond_init F
@@ -2563,6 +2564,7 @@ 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_barrierattr_destroy F
+GLIBC_2.42 pthread_barrierattr_init F
GLIBC_2.42 pthread_mutex_consistent F
GLIBC_2.42 pthread_mutex_consistent_np F
GLIBC_2.42 pthread_mutex_getprioceiling F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist
b/sysdeps/mach/hurd/i386/libpthread.abilist
index 6d9ffec92c..1083a7c001 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -26,7 +26,6 @@ GLIBC_2.12 pthread_barrier_destroy F
GLIBC_2.12 pthread_barrier_init F
GLIBC_2.12 pthread_barrier_wait F
GLIBC_2.12 pthread_barrierattr_getpshared F
-GLIBC_2.12 pthread_barrierattr_init F
GLIBC_2.12 pthread_barrierattr_setpshared F
GLIBC_2.12 pthread_cancel F
GLIBC_2.12 pthread_create F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist
b/sysdeps/mach/hurd/x86_64/libc.abilist
index b60abc1958..e7bada388e 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1532,6 +1532,7 @@ GLIBC_2.38 pthread_attr_setstack F
GLIBC_2.38 pthread_attr_setstackaddr F
GLIBC_2.38 pthread_attr_setstacksize F
GLIBC_2.38 pthread_barrierattr_destroy F
+GLIBC_2.38 pthread_barrierattr_init F
GLIBC_2.38 pthread_cond_broadcast F
GLIBC_2.38 pthread_cond_clockwait F
GLIBC_2.38 pthread_cond_destroy F
@@ -2246,6 +2247,7 @@ 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_barrierattr_destroy F
+GLIBC_2.42 pthread_barrierattr_init F
GLIBC_2.42 pthread_mutex_consistent F
GLIBC_2.42 pthread_mutex_consistent_np F
GLIBC_2.42 pthread_mutex_getprioceiling F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist
b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 860d406251..97a4377079 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -43,7 +43,6 @@ GLIBC_2.38 pthread_barrier_destroy F
GLIBC_2.38 pthread_barrier_init F
GLIBC_2.38 pthread_barrier_wait F
GLIBC_2.38 pthread_barrierattr_getpshared F
-GLIBC_2.38 pthread_barrierattr_init F
GLIBC_2.38 pthread_barrierattr_setpshared F
GLIBC_2.38 pthread_cancel F
GLIBC_2.38 pthread_clockjoin_np F
--
2.47.2
