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 | 3f0808ef4c872afeade0e323c024ac59ec90fc2b (patch) | |
| tree | 39f1f666d59c3ca16f286a8b875404fd6f8c57aa /nptl | |
| parent | 39e74af22e63b8b099862f37adffdbfaf9ad7a20 (diff) | |
| download | glibc-3f0808ef4c872afeade0e323c024ac59ec90fc2b.tar.gz glibc-3f0808ef4c872afeade0e323c024ac59ec90fc2b.tar.xz glibc-3f0808ef4c872afeade0e323c024ac59ec90fc2b.zip | |
nptl: Move pthread_barrierattr_setpshared 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_setpshared.c | 11 |
3 files changed, 12 insertions, 4 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 |