From ce4b3b7befc1010a4be0294d28984d0af47b7bc2 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 22 Apr 2021 15:18:12 +0200 Subject: 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. --- sysdeps/hppa/nptl/pthread_spin_init.c | 10 +++++++++- sysdeps/hppa/nptl/pthread_spin_unlock.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'sysdeps/hppa/nptl') 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 @@ . */ #include "pthreadP.h" +#include 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 @@ . */ #include "pthreadP.h" +#include 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 -- cgit 1.4.1