diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 10:23:24 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 17:06:48 +0200 |
| commit | 4baf02b33235b7cdcb252bafebc132c66020eedd (patch) | |
| tree | 7ef1a1e8205d89a0224743f19c15443ce793aead /sysdeps/sparc | |
| parent | da8e3710d8791f4b7f164ba9eb45b823ada44634 (diff) | |
| download | glibc-4baf02b33235b7cdcb252bafebc132c66020eedd.zip glibc-4baf02b33235b7cdcb252bafebc132c66020eedd.tar.gz glibc-4baf02b33235b7cdcb252bafebc132c66020eedd.tar.bz2 | |
nptl: Move pthread_spin_trylock into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
Diffstat (limited to 'sysdeps/sparc')
| -rw-r--r-- | sysdeps/sparc/sparc32/pthread_spin_trylock.S | 12 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/pthread_spin_trylock.S | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/sysdeps/sparc/sparc32/pthread_spin_trylock.S b/sysdeps/sparc/sparc32/pthread_spin_trylock.S index 8ed6ef0..5de33f1 100644 --- a/sysdeps/sparc/sparc32/pthread_spin_trylock.S +++ b/sysdeps/sparc/sparc32/pthread_spin_trylock.S @@ -17,13 +17,21 @@ #include <sysdep.h> #include <errno.h> +#include <shlib-compat.h> .text -ENTRY(pthread_spin_trylock) +ENTRY(__pthread_spin_trylock) ldstub [%o0], %o0 cmp %o0, 0 bne,a 1f mov EBUSY, %o0 1: retl nop -END(pthread_spin_trylock) +END(__pthread_spin_trylock) +versioned_symbol (libc, __pthread_spin_trylock, pthread_spin_trylock, + GLIBC_2_34) + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_spin_trylock, pthread_spin_trylock, + GLIBC_2_2) +#endif diff --git a/sysdeps/sparc/sparc64/pthread_spin_trylock.S b/sysdeps/sparc/sparc64/pthread_spin_trylock.S index 0c41550..c6ece81 100644 --- a/sysdeps/sparc/sparc64/pthread_spin_trylock.S +++ b/sysdeps/sparc/sparc64/pthread_spin_trylock.S @@ -17,11 +17,19 @@ #include <sysdep.h> #include <errno.h> +#include <shlib-compat.h> .text -ENTRY(pthread_spin_trylock) +ENTRY(__pthread_spin_trylock) ldstub [%o0], %o0 membar #StoreLoad | #StoreStore retl movrnz %o0, EBUSY, %o0 -END(pthread_spin_trylock) +END(__pthread_spin_trylock) +versioned_symbol (libc, __pthread_spin_trylock, pthread_spin_trylock, + GLIBC_2_34) + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34) +compat_symbol (libpthread, __pthread_spin_trylock, pthread_spin_trylock, + GLIBC_2_2) +#endif |