diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 10:11:51 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 17:06:46 +0200 |
| commit | da8e3710d8791f4b7f164ba9eb45b823ada44634 (patch) | |
| tree | 0cb74656b1450c82d16331ee8c3a6f281ccbaacd /nptl | |
| parent | ce4b3b7befc1010a4be0294d28984d0af47b7bc2 (diff) | |
| download | glibc-da8e3710d8791f4b7f164ba9eb45b823ada44634.tar glibc-da8e3710d8791f4b7f164ba9eb45b823ada44634.tar.gz glibc-da8e3710d8791f4b7f164ba9eb45b823ada44634.tar.bz2 glibc-da8e3710d8791f4b7f164ba9eb45b823ada44634.zip | |
nptl: Move pthread_spin_lock 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_lock.c | 8 |
3 files changed, 10 insertions, 3 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index dd7fa95c2b..011f53eab2 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -131,6 +131,7 @@ routines = \ pthread_sigmask \ pthread_spin_destroy \ pthread_spin_init \ + pthread_spin_lock \ pthread_spin_unlock \ tpp \ unwind \ @@ -197,7 +198,6 @@ libpthread-routines = \ pthread_setname \ pthread_setschedprio \ pthread_sigqueue \ - pthread_spin_lock \ pthread_spin_trylock \ pthread_testcancel \ pthread_timedjoin \ diff --git a/nptl/Versions b/nptl/Versions index 8ec1d4bbd2..242c3a3d9d 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -81,6 +81,7 @@ libc { pthread_mutexattr_setpshared; pthread_spin_destroy; pthread_spin_init; + pthread_spin_lock; pthread_spin_unlock; } GLIBC_2.2.3 { @@ -184,6 +185,7 @@ libc { pthread_setspecific; pthread_spin_destroy; pthread_spin_init; + pthread_spin_lock; pthread_spin_unlock; } GLIBC_PRIVATE { @@ -316,7 +318,6 @@ libpthread { pthread_getcpuclockid; pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; - pthread_spin_lock; pthread_spin_trylock; pthread_yield; sem_timedwait; diff --git a/nptl/pthread_spin_lock.c b/nptl/pthread_spin_lock.c index c07591bf4c..b4eb4cd196 100644 --- a/nptl/pthread_spin_lock.c +++ b/nptl/pthread_spin_lock.c @@ -18,9 +18,10 @@ #include <atomic.h> #include "pthreadP.h" +#include <shlib-compat.h> int -pthread_spin_lock (pthread_spinlock_t *lock) +__pthread_spin_lock (pthread_spinlock_t *lock) { int val = 0; @@ -78,3 +79,8 @@ pthread_spin_lock (pthread_spinlock_t *lock) return 0; } +versioned_symbol (libc, __pthread_spin_lock, pthread_spin_lock, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_spin_lock, pthread_spin_lock, GLIBC_2_2); +#endif |