about summary refs log tree commit diff
path: root/sysdeps/x86_64
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-04-22 15:18:12 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-04-23 17:06:44 +0200
commitce4b3b7befc1010a4be0294d28984d0af47b7bc2 (patch)
tree3a098b52827d0ba5ae835bafe65485dfe2b702ec /sysdeps/x86_64
parentc7b1cd4ad100d01f3202a44ec3b84b87bea5ef19 (diff)
downloadglibc-ce4b3b7befc1010a4be0294d28984d0af47b7bc2.tar.gz
glibc-ce4b3b7befc1010a4be0294d28984d0af47b7bc2.tar.xz
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/x86_64')
-rw-r--r--sysdeps/x86_64/nptl/pthread_spin_unlock.S16
1 files changed, 11 insertions, 5 deletions
diff --git a/sysdeps/x86_64/nptl/pthread_spin_unlock.S b/sysdeps/x86_64/nptl/pthread_spin_unlock.S
index ff197086ab..0dfa7f4229 100644
--- a/sysdeps/x86_64/nptl/pthread_spin_unlock.S
+++ b/sysdeps/x86_64/nptl/pthread_spin_unlock.S
@@ -17,13 +17,19 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
+#include <shlib-compat.h>
 
-ENTRY(pthread_spin_unlock)
+ENTRY(__pthread_spin_unlock)
 	movl	$1, (%rdi)
 	xorl	%eax, %eax
 	retq
-END(pthread_spin_unlock)
+END(__pthread_spin_unlock)
+versioned_symbol (libc, __pthread_spin_unlock, pthread_spin_unlock, GLIBC_2_34)
+/* The implementation of pthread_spin_init is identical.  */
+versioned_symbol (libc, __pthread_spin_unlock, pthread_spin_init, GLIBC_2_34)
 
-	/* The implementation of pthread_spin_init is identical.  */
-	.globl	pthread_spin_init
-pthread_spin_init = pthread_spin_unlock
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_spin_unlock, pthread_spin_unlock,
+	       GLIBC_2_2)
+compat_symbol (libpthread, __pthread_spin_unlock, pthread_spin_init, GLIBC_2_2)
+#endif