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 | 39e74af22e63b8b099862f37adffdbfaf9ad7a20 (patch) | |
| tree | cfc6ba66451b136b1810558ce411836f824170f1 /nptl | |
| parent | e731212bc3a3af5935aa0cc2ec738eddb127f383 (diff) | |
| download | glibc-39e74af22e63b8b099862f37adffdbfaf9ad7a20.tar.gz | |
nptl: Move pthread_barrierattr_getpshared 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_getpshared.c | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 3418ab6885..5f1f553edb 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -77,6 +77,7 @@ routines = \ pthread_barrier_init \ pthread_barrier_wait \ pthread_barrierattr_destroy \ + pthread_barrierattr_getpshared \ pthread_barrierattr_init \ pthread_cleanup_upto \ pthread_cond_broadcast \ @@ -192,7 +193,6 @@ libpthread-routines = \ pthread_attr_setstack \ pthread_attr_setstackaddr \ pthread_attr_setstacksize \ - pthread_barrierattr_getpshared \ pthread_barrierattr_setpshared \ pthread_cancel \ pthread_clockjoin \ diff --git a/nptl/Versions b/nptl/Versions index 42141ec1b1..e30f73c198 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -142,6 +142,7 @@ libc { __pthread_cleanup_routine; __pthread_unwind_next; pthread_attr_setaffinity_np; + pthread_barrierattr_getpshared; pthread_condattr_getclock; pthread_condattr_setclock; pthread_getaffinity_np; @@ -227,6 +228,7 @@ libc { pthread_barrier_init; pthread_barrier_wait; pthread_barrierattr_destroy; + pthread_barrierattr_getpshared; pthread_barrierattr_init; pthread_cond_clockwait; pthread_condattr_getclock; @@ -404,7 +406,6 @@ libpthread { __pthread_unregister_cancel; __pthread_unregister_cancel_restore; pthread_attr_getaffinity_np; - pthread_barrierattr_getpshared; pthread_setaffinity_np; pthread_timedjoin_np; pthread_tryjoin_np; diff --git a/nptl/pthread_barrierattr_getpshared.c b/nptl/pthread_barrierattr_getpshared.c index d7cd3034a5..986e4a50e3 100644 --- a/nptl/pthread_barrierattr_getpshared.c +++ b/nptl/pthread_barrierattr_getpshared.c @@ -17,13 +17,20 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_barrierattr_getpshared (const pthread_barrierattr_t *attr, +__pthread_barrierattr_getpshared (const pthread_barrierattr_t *attr, int *pshared) { *pshared = ((const struct pthread_barrierattr *) attr)->pshared; return 0; } +versioned_symbol (libc, __pthread_barrierattr_getpshared, + pthread_barrierattr_getpshared, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_34) +compat_symbol (libpthread, __pthread_barrierattr_getpshared, + pthread_barrierattr_getpshared, GLIBC_2_3_3); +#endif |