about summary refs log tree commit diff
path: root/sysdeps/x86_64/nptl
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-04-23 10:23:24 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-04-23 17:06:48 +0200
commit4baf02b33235b7cdcb252bafebc132c66020eedd (patch)
tree7ef1a1e8205d89a0224743f19c15443ce793aead /sysdeps/x86_64/nptl
parentda8e3710d8791f4b7f164ba9eb45b823ada44634 (diff)
downloadglibc-4baf02b33235b7cdcb252bafebc132c66020eedd.tar.gz
glibc-4baf02b33235b7cdcb252bafebc132c66020eedd.tar.xz
glibc-4baf02b33235b7cdcb252bafebc132c66020eedd.zip
nptl: Move pthread_spin_trylock into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
Diffstat (limited to 'sysdeps/x86_64/nptl')
-rw-r--r--sysdeps/x86_64/nptl/pthread_spin_trylock.S13
1 files changed, 10 insertions, 3 deletions
diff --git a/sysdeps/x86_64/nptl/pthread_spin_trylock.S b/sysdeps/x86_64/nptl/pthread_spin_trylock.S
index 1a70b2d8bb..f4829d6680 100644
--- a/sysdeps/x86_64/nptl/pthread_spin_trylock.S
+++ b/sysdeps/x86_64/nptl/pthread_spin_trylock.S
@@ -18,9 +18,9 @@
 
 #include <sysdep.h>
 #include <errno.h>
+#include <shlib-compat.h>
 
-
-ENTRY(pthread_spin_trylock)
+ENTRY(__pthread_spin_trylock)
 	movl	$1, %eax
 	xorl	%ecx, %ecx
 	lock
@@ -28,4 +28,11 @@ ENTRY(pthread_spin_trylock)
 	movl	$EBUSY, %eax
 	cmovel	%ecx, %eax
 	retq
-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