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 | e731212bc3a3af5935aa0cc2ec738eddb127f383 (patch) | |
| tree | bdd386c2e24511a61f76305fcac08f445ac8546e /nptl | |
| parent | bbacf0f56cac095869b75e557b8bcd3b97964050 (diff) | |
| download | glibc-e731212bc3a3af5935aa0cc2ec738eddb127f383.zip glibc-e731212bc3a3af5935aa0cc2ec738eddb127f383.tar.gz glibc-e731212bc3a3af5935aa0cc2ec738eddb127f383.tar.bz2 | |
nptl: Move pthread_barrierattr_init 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_init.c | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 404242f..3418ab6 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -77,6 +77,7 @@ routines = \ pthread_barrier_init \ pthread_barrier_wait \ pthread_barrierattr_destroy \ + pthread_barrierattr_init \ pthread_cleanup_upto \ pthread_cond_broadcast \ pthread_cond_destroy \ @@ -192,7 +193,6 @@ libpthread-routines = \ pthread_attr_setstackaddr \ pthread_attr_setstacksize \ pthread_barrierattr_getpshared \ - pthread_barrierattr_init \ pthread_barrierattr_setpshared \ pthread_cancel \ pthread_clockjoin \ diff --git a/nptl/Versions b/nptl/Versions index 0b5ce84..42141ec 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -110,6 +110,7 @@ libc { pthread_barrier_init; pthread_barrier_wait; pthread_barrierattr_destroy; + pthread_barrierattr_init; pthread_condattr_getpshared; pthread_condattr_setpshared; pthread_mutex_timedlock; @@ -226,6 +227,7 @@ libc { pthread_barrier_init; pthread_barrier_wait; pthread_barrierattr_destroy; + pthread_barrierattr_init; pthread_cond_clockwait; pthread_condattr_getclock; pthread_condattr_getpshared; @@ -377,7 +379,6 @@ libpthread { GLIBC_2.2 { pthread_attr_getstack; pthread_attr_setstack; - pthread_barrierattr_init; pthread_barrierattr_setpshared; pthread_getcpuclockid; pthread_yield; diff --git a/nptl/pthread_barrierattr_init.c b/nptl/pthread_barrierattr_init.c index 4a916cf..6030520 100644 --- a/nptl/pthread_barrierattr_init.c +++ b/nptl/pthread_barrierattr_init.c @@ -17,10 +17,10 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_barrierattr_init (pthread_barrierattr_t *attr) +__pthread_barrierattr_init (pthread_barrierattr_t *attr) { ASSERT_TYPE_SIZE (pthread_barrierattr_t, __SIZEOF_PTHREAD_BARRIERATTR_T); ASSERT_PTHREAD_INTERNAL_SIZE (pthread_barrierattr_t, @@ -30,3 +30,10 @@ pthread_barrierattr_init (pthread_barrierattr_t *attr) return 0; } +versioned_symbol (libc, __pthread_barrierattr_init, + pthread_barrierattr_init, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_barrierattr_init, + pthread_barrierattr_init, GLIBC_2_2); +#endif |