diff options
author | Florian Weimer <fweimer@redhat.com> | 2021-04-22 15:18:12 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 17:06:44 +0200 |
commit | ce4b3b7befc1010a4be0294d28984d0af47b7bc2 (patch) | |
tree | 3a098b52827d0ba5ae835bafe65485dfe2b702ec /sysdeps/hppa/nptl | |
parent | c7b1cd4ad100d01f3202a44ec3b84b87bea5ef19 (diff) | |
download | glibc-ce4b3b7befc1010a4be0294d28984d0af47b7bc2.tar glibc-ce4b3b7befc1010a4be0294d28984d0af47b7bc2.tar.gz glibc-ce4b3b7befc1010a4be0294d28984d0af47b7bc2.tar.bz2 glibc-ce4b3b7befc1010a4be0294d28984d0af47b7bc2.zip |
nptl: Move pthread_spin_init, Move pthread_spin_unlock into libc
For some architectures, the two functions are aliased, so these
symbols need to be moved at the same time.
The symbols were moved using scripts/move-symbol-to-libc.py.
Diffstat (limited to 'sysdeps/hppa/nptl')
-rw-r--r-- | sysdeps/hppa/nptl/pthread_spin_init.c | 10 | ||||
-rw-r--r-- | sysdeps/hppa/nptl/pthread_spin_unlock.c | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/sysdeps/hppa/nptl/pthread_spin_init.c b/sysdeps/hppa/nptl/pthread_spin_init.c index 6d63af586a..af7655519d 100644 --- a/sysdeps/hppa/nptl/pthread_spin_init.c +++ b/sysdeps/hppa/nptl/pthread_spin_init.c @@ -16,9 +16,10 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" +#include <shlib-compat.h> int -pthread_spin_init (pthread_spinlock_t *lock, int pshared) +__pthread_spin_init (pthread_spinlock_t *lock, int pshared) { /* CONCURRENCTY NOTES: @@ -42,3 +43,10 @@ pthread_spin_init (pthread_spinlock_t *lock, int pshared) atomic_exchange_rel (lock, 0); return 0; } +versioned_symbol (libc, __pthread_spin_init, pthread_spin_init, + GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_spin_init, pthread_spin_init, + GLIBC_2_2); +#endif diff --git a/sysdeps/hppa/nptl/pthread_spin_unlock.c b/sysdeps/hppa/nptl/pthread_spin_unlock.c index 2a6ffe43dc..a087501337 100644 --- a/sysdeps/hppa/nptl/pthread_spin_unlock.c +++ b/sysdeps/hppa/nptl/pthread_spin_unlock.c @@ -16,9 +16,10 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" +#include <shlib-compat.h> int -pthread_spin_unlock (pthread_spinlock_t *lock) +__pthread_spin_unlock (pthread_spinlock_t *lock) { /* CONCURRENCTY NOTES: @@ -42,3 +43,10 @@ pthread_spin_unlock (pthread_spinlock_t *lock) atomic_exchange_rel (lock, 0); return 0; } +versioned_symbol (libc, __pthread_spin_unlock, pthread_spin_unlock, + GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_spin_unlock, pthread_spin_unlock, + GLIBC_2_2); +#endif |