diff options
64 files changed, 76 insertions, 33 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 90c8f2ec72..404242feb1 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -76,6 +76,7 @@ routines = \ pthread_barrier_destroy \ pthread_barrier_init \ pthread_barrier_wait \ + pthread_barrierattr_destroy \ pthread_cleanup_upto \ pthread_cond_broadcast \ pthread_cond_destroy \ @@ -190,7 +191,6 @@ libpthread-routines = \ pthread_attr_setstack \ pthread_attr_setstackaddr \ pthread_attr_setstacksize \ - pthread_barrierattr_destroy \ pthread_barrierattr_getpshared \ pthread_barrierattr_init \ pthread_barrierattr_setpshared \ diff --git a/nptl/Versions b/nptl/Versions index 944c2e1ddc..0b5ce84f6e 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -109,6 +109,7 @@ libc { pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait; + pthread_barrierattr_destroy; pthread_condattr_getpshared; pthread_condattr_setpshared; pthread_mutex_timedlock; @@ -224,6 +225,7 @@ libc { pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait; + pthread_barrierattr_destroy; pthread_cond_clockwait; pthread_condattr_getclock; pthread_condattr_getpshared; @@ -375,7 +377,6 @@ libpthread { GLIBC_2.2 { pthread_attr_getstack; pthread_attr_setstack; - pthread_barrierattr_destroy; pthread_barrierattr_init; pthread_barrierattr_setpshared; pthread_getcpuclockid; diff --git a/nptl/pthread_barrierattr_destroy.c b/nptl/pthread_barrierattr_destroy.c index 613d1e4c1a..fc0a844d09 100644 --- a/nptl/pthread_barrierattr_destroy.c +++ b/nptl/pthread_barrierattr_destroy.c @@ -17,12 +17,19 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_barrierattr_destroy (pthread_barrierattr_t *attr) +__pthread_barrierattr_destroy (pthread_barrierattr_t *attr) { /* Nothing to do. */ return 0; } +versioned_symbol (libc, __pthread_barrierattr_destroy, + pthread_barrierattr_destroy, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_barrierattr_destroy, + pthread_barrierattr_destroy, GLIBC_2_2); +#endif diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index ec554785f4..78871f1aa4 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1458,6 +1458,7 @@ GLIBC_2.17 pthread_attr_setscope F GLIBC_2.17 pthread_barrier_destroy F GLIBC_2.17 pthread_barrier_init F GLIBC_2.17 pthread_barrier_wait F +GLIBC_2.17 pthread_barrierattr_destroy F GLIBC_2.17 pthread_cond_broadcast F GLIBC_2.17 pthread_cond_destroy F GLIBC_2.17 pthread_cond_init F @@ -2311,6 +2312,7 @@ GLIBC_2.34 mtx_unlock F GLIBC_2.34 pthread_barrier_destroy F GLIBC_2.34 pthread_barrier_init F GLIBC_2.34 pthread_barrier_wait F +GLIBC_2.34 pthread_barrierattr_destroy 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 2f0500df42..d7d512a460 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_destroy F GLIBC_2.17 pthread_barrierattr_getpshared F GLIBC_2.17 pthread_barrierattr_init F GLIBC_2.17 pthread_barrierattr_setpshared F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 93b07551b5..b4386b4427 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2011,6 +2011,7 @@ GLIBC_2.2 pread64 F GLIBC_2.2 pthread_barrier_destroy F 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_condattr_getpshared F GLIBC_2.2 pthread_condattr_setpshared F GLIBC_2.2 pthread_mutex_timedlock F @@ -2398,6 +2399,7 @@ GLIBC_2.34 mtx_unlock F GLIBC_2.34 pthread_barrier_destroy F GLIBC_2.34 pthread_barrier_init F GLIBC_2.34 pthread_barrier_wait F +GLIBC_2.34 pthread_barrierattr_destroy 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 903e88b0bc..418ff6136d 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_destroy F GLIBC_2.2 pthread_barrierattr_init F GLIBC_2.2 pthread_barrierattr_setpshared F GLIBC_2.2 pthread_getcpuclockid F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index f6d6be172d..9f8ef3f892 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1397,6 +1397,7 @@ GLIBC_2.32 pthread_attr_setsigmask_np F GLIBC_2.32 pthread_barrier_destroy F GLIBC_2.32 pthread_barrier_init F GLIBC_2.32 pthread_barrier_wait F +GLIBC_2.32 pthread_barrierattr_destroy F GLIBC_2.32 pthread_cond_broadcast F GLIBC_2.32 pthread_cond_clockwait F GLIBC_2.32 pthread_cond_destroy F @@ -2070,6 +2071,7 @@ GLIBC_2.34 mtx_unlock F GLIBC_2.34 pthread_barrier_destroy F GLIBC_2.34 pthread_barrier_init F GLIBC_2.34 pthread_barrier_wait F +GLIBC_2.34 pthread_barrierattr_destroy 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 0d633d712e..07d393eef0 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_destroy F GLIBC_2.32 pthread_barrierattr_getpshared F GLIBC_2.32 pthread_barrierattr_init F GLIBC_2.32 pthread_barrierattr_setpshared F diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist index 090db39286..11802c9f0c 100644 --- a/ |