From c96dddd7311e7ffa2a7995de5c2560d9979fd962 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 09:10:57 +0200 Subject: nptl: Move pthread_rwlock_tryrdlock into libc And __pthread_rwlock_tryrdlock as a compatibility symbol. Remove the unused __libc_rwlock_tryrdlock macro. The symbols were moved using scripts/move-symbol-to-libc.py. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/x86_64/64') diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 9d234de932..764f3105aa 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -374,6 +374,7 @@ GLIBC_2.2.5 __pthread_once F GLIBC_2.2.5 __pthread_rwlock_destroy F GLIBC_2.2.5 __pthread_rwlock_init F GLIBC_2.2.5 __pthread_rwlock_rdlock F +GLIBC_2.2.5 __pthread_rwlock_tryrdlock F GLIBC_2.2.5 __pthread_rwlock_unlock F GLIBC_2.2.5 __pthread_rwlock_wrlock F GLIBC_2.2.5 __pthread_setspecific F @@ -1333,6 +1334,7 @@ GLIBC_2.2.5 pthread_rwlock_init F GLIBC_2.2.5 pthread_rwlock_rdlock F GLIBC_2.2.5 pthread_rwlock_timedrdlock F GLIBC_2.2.5 pthread_rwlock_timedwrlock F +GLIBC_2.2.5 pthread_rwlock_tryrdlock F GLIBC_2.2.5 pthread_rwlock_unlock F GLIBC_2.2.5 pthread_rwlock_wrlock F GLIBC_2.2.5 pthread_self F @@ -2226,6 +2228,7 @@ GLIBC_2.34 pthread_rwlock_init F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_timedrdlock F GLIBC_2.34 pthread_rwlock_timedwrlock F +GLIBC_2.34 pthread_rwlock_tryrdlock F GLIBC_2.34 pthread_rwlock_unlock F GLIBC_2.34 pthread_rwlock_wrlock F GLIBC_2.34 pthread_setspecific F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index ae3e0414ee..fa5f6f5127 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -7,7 +7,6 @@ GLIBC_2.2.5 _IO_flockfile F GLIBC_2.2.5 _IO_ftrylockfile F GLIBC_2.2.5 _IO_funlockfile F GLIBC_2.2.5 __errno_location F -GLIBC_2.2.5 __pthread_rwlock_tryrdlock F GLIBC_2.2.5 __pthread_rwlock_trywrlock F GLIBC_2.2.5 flockfile F GLIBC_2.2.5 ftrylockfile F @@ -32,7 +31,6 @@ GLIBC_2.2.5 pthread_detach F GLIBC_2.2.5 pthread_getconcurrency F GLIBC_2.2.5 pthread_getcpuclockid F GLIBC_2.2.5 pthread_join F -GLIBC_2.2.5 pthread_rwlock_tryrdlock F GLIBC_2.2.5 pthread_rwlock_trywrlock F GLIBC_2.2.5 pthread_rwlockattr_destroy F GLIBC_2.2.5 pthread_rwlockattr_getkind_np F -- cgit 1.4.1