diff options
64 files changed, 76 insertions, 33 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 5f1f553edb..b5f26c6864 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -79,6 +79,7 @@ routines = \ pthread_barrierattr_destroy \ pthread_barrierattr_getpshared \ pthread_barrierattr_init \ + pthread_barrierattr_setpshared \ pthread_cleanup_upto \ pthread_cond_broadcast \ pthread_cond_destroy \ @@ -193,7 +194,6 @@ libpthread-routines = \ pthread_attr_setstack \ pthread_attr_setstackaddr \ pthread_attr_setstacksize \ - pthread_barrierattr_setpshared \ pthread_cancel \ pthread_clockjoin \ pthread_create \ diff --git a/nptl/Versions b/nptl/Versions index e30f73c198..f950b77969 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -111,6 +111,7 @@ libc { pthread_barrier_wait; pthread_barrierattr_destroy; pthread_barrierattr_init; + pthread_barrierattr_setpshared; pthread_condattr_getpshared; pthread_condattr_setpshared; pthread_mutex_timedlock; @@ -229,6 +230,7 @@ libc { pthread_barrier_wait; pthread_barrierattr_destroy; pthread_barrierattr_getpshared; + pthread_barrierattr_setpshared; pthread_barrierattr_init; pthread_cond_clockwait; pthread_condattr_getclock; @@ -381,7 +383,6 @@ libpthread { GLIBC_2.2 { pthread_attr_getstack; pthread_attr_setstack; - pthread_barrierattr_setpshared; pthread_getcpuclockid; pthread_yield; pthread_rwlock_timedrdlock; diff --git a/nptl/pthread_barrierattr_setpshared.c b/nptl/pthread_barrierattr_setpshared.c index efa19b0a61..8e25e6cb20 100644 --- a/nptl/pthread_barrierattr_setpshared.c +++ b/nptl/pthread_barrierattr_setpshared.c @@ -19,10 +19,10 @@ #include <errno.h> #include "pthreadP.h" #include <futex-internal.h> - +#include <shlib-compat.h> int -pthread_barrierattr_setpshared (pthread_barrierattr_t *attr, int pshared) +__pthread_barrierattr_setpshared (pthread_barrierattr_t *attr, int pshared) { int err = futex_supports_pshared (pshared); if (err != 0) @@ -32,3 +32,10 @@ pthread_barrierattr_setpshared (pthread_barrierattr_t *attr, int pshared) return 0; } +versioned_symbol (libc, __pthread_barrierattr_setpshared, + pthread_barrierattr_setpshared, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_barrierattr_setpshared, + pthread_barrierattr_setpshared, GLIBC_2_2); +#endif diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index a1bef005aa..36d760212c 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1461,6 +1461,7 @@ GLIBC_2.17 pthread_barrier_wait F GLIBC_2.17 pthread_barrierattr_destroy F GLIBC_2.17 pthread_barrierattr_getpshared F GLIBC_2.17 pthread_barrierattr_init F +GLIBC_2.17 pthread_barrierattr_setpshared F GLIBC_2.17 pthread_cond_broadcast F GLIBC_2.17 pthread_cond_destroy F GLIBC_2.17 pthread_cond_init F @@ -2317,6 +2318,7 @@ GLIBC_2.34 pthread_barrier_wait F GLIBC_2.34 pthread_barrierattr_destroy F GLIBC_2.34 pthread_barrierattr_getpshared F GLIBC_2.34 pthread_barrierattr_init F +GLIBC_2.34 pthread_barrierattr_setpshared F GLIBC_2.34 pthread_cond_clockwait F GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index 8d844fd984..b4f0fdd999 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -18,7 +18,6 @@ GLIBC_2.17 pthread_attr_setguardsize F GLIBC_2.17 pthread_attr_setstack F GLIBC_2.17 pthread_attr_setstackaddr F GLIBC_2.17 pthread_attr_setstacksize F -GLIBC_2.17 pthread_barrierattr_setpshared F GLIBC_2.17 pthread_cancel F GLIBC_2.17 pthread_create F GLIBC_2.17 pthread_detach F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 83919a7fa5..8fc9b75676 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2013,6 +2013,7 @@ GLIBC_2.2 pthread_barrier_init F GLIBC_2.2 pthread_barrier_wait F GLIBC_2.2 pthread_barrierattr_destroy F GLIBC_2.2 pthread_barrierattr_init F +GLIBC_2.2 pthread_barrierattr_setpshared F GLIBC_2.2 pthread_condattr_getpshared F GLIBC_2.2 pthread_condattr_setpshared F GLIBC_2.2 pthread_mutex_timedlock F @@ -2404,6 +2405,7 @@ GLIBC_2.34 pthread_barrier_wait F GLIBC_2.34 pthread_barrierattr_destroy F GLIBC_2.34 pthread_barrierattr_getpshared F GLIBC_2.34 pthread_barrierattr_init F +GLIBC_2.34 pthread_barrierattr_setpshared F GLIBC_2.34 pthread_cond_clockwait F GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 706c436d8b..c2017537e2 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -27,7 +27,6 @@ GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F GLIBC_2.2 pthread_attr_getstack F GLIBC_2.2 pthread_attr_setstack F -GLIBC_2.2 pthread_barrierattr_setpshared F GLIBC_2.2 pthread_getcpuclockid F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index 69fc97ca3d..8e84a695fd 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1400,6 +1400,7 @@ GLIBC_2.32 pthread_barrier_wait F GLIBC_2.32 pthread_barrierattr_destroy F GLIBC_2.32 pthread_barrierattr_getpshared F GLIBC_2.32 pthread_barrierattr_init F +GLIBC_2.32 pthread_barrierattr_setpshared F GLIBC_2.32 pthread_cond_broadcast F GLIBC_2.32 pthread_cond_clockwait F GLIBC_2.32 pthread_cond_destroy F @@ -2076,6 +2077,7 @@ GLIBC_2.34 pthread_barrier_wait F GLIBC_2.34 pthread_barrierattr_destroy F GLIBC_2.34 pthread_barrierattr_getpshared F GLIBC_2.34 pthread_barrierattr_init F +GLIBC_2.34 pthread_barrierattr_setpshared F GLIBC_2.34 pthread_cond_clockwait F GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist index 2e96bb1cd9..bc072be61f 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -18,7 +18,6 @@ GLIBC_2.32 pthread_attr_setguardsize F GLIBC_2.32 pthread_attr_setstack F GLIBC_2.32 pthread_attr_setstackaddr F GLIBC_2.32 pthread_attr_setstacksize F -GLIBC_2.32 pthread_barrierattr_setpshared F GLIBC_2.32 |