diff options
author | Florian Weimer <fweimer@redhat.com> | 2021-05-06 15:56:37 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2021-05-06 15:56:37 +0200 |
commit | bbacf0f56cac095869b75e557b8bcd3b97964050 (patch) | |
tree | 6f1cd3fe42eb3bfba830996ab8d9cfe024f89acd /nptl | |
parent | b9aec0dd9f270b09be6546443e8070de7e8b0d98 (diff) | |
download | glibc-bbacf0f56cac095869b75e557b8bcd3b97964050.tar.gz glibc-bbacf0f56cac095869b75e557b8bcd3b97964050.tar.xz glibc-bbacf0f56cac095869b75e557b8bcd3b97964050.zip |
nptl: Move pthread_barrierattr_destroy into libc
The symbol was moved using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/Makefile | 2 | ||||
-rw-r--r-- | nptl/Versions | 3 | ||||
-rw-r--r-- | nptl/pthread_barrierattr_destroy.c | 11 |
3 files changed, 12 insertions, 4 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 |