From 4baf02b33235b7cdcb252bafebc132c66020eedd Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 23 Apr 2021 10:23:24 +0200 Subject: nptl: Move pthread_spin_trylock into libc The symbol was moved using scripts/move-symbol-to-libc.py. --- sysdeps/x86_64/nptl/pthread_spin_trylock.S | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'sysdeps/x86_64') 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 #include +#include - -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 -- cgit v1.2.3