diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-22 15:12:09 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 17:06:42 +0200 |
| commit | c7b1cd4ad100d01f3202a44ec3b84b87bea5ef19 (patch) | |
| tree | f34f4773fd39afc05eac4f4511222b830e7dc0f9 /nptl | |
| parent | d9b600c98503b4094bc168b9b7452ea39a0abf30 (diff) | |
| download | glibc-c7b1cd4ad100d01f3202a44ec3b84b87bea5ef19.tar.gz glibc-c7b1cd4ad100d01f3202a44ec3b84b87bea5ef19.tar.xz glibc-c7b1cd4ad100d01f3202a44ec3b84b87bea5ef19.zip | |
nptl: Move pthread_spin_destroy into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 3 | ||||
| -rw-r--r-- | nptl/pthread_spin_destroy.c | 11 |
3 files changed, 12 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 264ada0ba2..7b36d85f6b 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -129,6 +129,7 @@ routines = \ pthread_setschedparam \ pthread_setspecific \ pthread_sigmask \ + pthread_spin_destroy \ tpp \ unwind \ @@ -194,7 +195,6 @@ libpthread-routines = \ pthread_setname \ pthread_setschedprio \ pthread_sigqueue \ - pthread_spin_destroy \ pthread_spin_init \ pthread_spin_lock \ pthread_spin_trylock \ diff --git a/nptl/Versions b/nptl/Versions index 0a627a4219..22fd51ef12 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -79,6 +79,7 @@ libc { pthread_mutex_timedlock; pthread_mutexattr_getpshared; pthread_mutexattr_setpshared; + pthread_spin_destroy; } GLIBC_2.2.3 { pthread_getattr_np; @@ -179,6 +180,7 @@ libc { pthread_rwlock_unlock; pthread_rwlock_wrlock; pthread_setspecific; + pthread_spin_destroy; } GLIBC_PRIVATE { __futex_abstimed_wait64; @@ -310,7 +312,6 @@ libpthread { pthread_getcpuclockid; pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; - pthread_spin_destroy; pthread_spin_init; pthread_spin_lock; pthread_spin_trylock; diff --git a/nptl/pthread_spin_destroy.c b/nptl/pthread_spin_destroy.c index 776ba12e35..dcdbf18c4a 100644 --- a/nptl/pthread_spin_destroy.c +++ b/nptl/pthread_spin_destroy.c @@ -17,11 +17,18 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_spin_destroy (pthread_spinlock_t *lock) +__pthread_spin_destroy (pthread_spinlock_t *lock) { /* Nothing to do. */ return 0; } +versioned_symbol (libc, __pthread_spin_destroy, pthread_spin_destroy, + GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_spin_destroy, pthread_spin_destroy, + GLIBC_2_2); +#endif |