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 | b9aec0dd9f270b09be6546443e8070de7e8b0d98 (patch) | |
| tree | acd4f83813fae1be8cbc4fee1c9a6aa12dac7769 /nptl/pthread_barrier_wait.c | |
| parent | f1af331c4e87dee7d91e404b9f746c99ca3f2c71 (diff) | |
| download | glibc-b9aec0dd9f270b09be6546443e8070de7e8b0d98.zip glibc-b9aec0dd9f270b09be6546443e8070de7e8b0d98.tar.gz glibc-b9aec0dd9f270b09be6546443e8070de7e8b0d98.tar.bz2 | |
nptl: Move pthread_barrier_wait 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/pthread_barrier_wait.c')
| -rw-r--r-- | nptl/pthread_barrier_wait.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/nptl/pthread_barrier_wait.c b/nptl/pthread_barrier_wait.c index 90ffd67..4f8abe1 100644 --- a/nptl/pthread_barrier_wait.c +++ b/nptl/pthread_barrier_wait.c @@ -20,6 +20,7 @@ #include <sysdep.h> #include <futex-internal.h> #include <pthreadP.h> +#include <shlib-compat.h> /* Wait on the barrier. @@ -92,7 +93,7 @@ If we do not spin, it is quite likely that at least some other threads will have called futex_wait already. */ int -__pthread_barrier_wait (pthread_barrier_t *barrier) +___pthread_barrier_wait (pthread_barrier_t *barrier) { struct pthread_barrier *bar = (struct pthread_barrier *) barrier; @@ -220,4 +221,13 @@ __pthread_barrier_wait (pthread_barrier_t *barrier) /* Return a special value for exactly one thread per round. */ return i % count == 0 ? PTHREAD_BARRIER_SERIAL_THREAD : 0; } -weak_alias (__pthread_barrier_wait, pthread_barrier_wait) +versioned_symbol (libc, ___pthread_barrier_wait, pthread_barrier_wait, + GLIBC_2_34); +versioned_symbol (libc, ___pthread_barrier_wait, __pthread_barrier_wait, + GLIBC_PRIVATE); +libc_hidden_ver (___pthread_barrier_wait, __pthread_barrier_wait) + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, ___pthread_barrier_wait, pthread_barrier_wait, + GLIBC_2_2); +#endif |