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/arm/be/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/arm/be/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/arm/le/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/arm/le/libpthread.abilist | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/arm') diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist index e8f0f81..6c8ce3d 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist @@ -234,6 +234,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 @@ -589,6 +590,7 @@ GLIBC_2.4 __pthread_once F GLIBC_2.4 __pthread_rwlock_destroy F GLIBC_2.4 __pthread_rwlock_init F GLIBC_2.4 __pthread_rwlock_rdlock F +GLIBC_2.4 __pthread_rwlock_tryrdlock F GLIBC_2.4 __pthread_rwlock_unlock F GLIBC_2.4 __pthread_rwlock_wrlock F GLIBC_2.4 __pthread_setspecific F @@ -1687,6 +1689,7 @@ GLIBC_2.4 pthread_rwlock_init F GLIBC_2.4 pthread_rwlock_rdlock F GLIBC_2.4 pthread_rwlock_timedrdlock F GLIBC_2.4 pthread_rwlock_timedwrlock F +GLIBC_2.4 pthread_rwlock_tryrdlock F GLIBC_2.4 pthread_rwlock_unlock F GLIBC_2.4 pthread_rwlock_wrlock F GLIBC_2.4 pthread_self F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index f6062d3..b9f1c4b 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -15,7 +15,6 @@ GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F GLIBC_2.4 __pthread_register_cancel F GLIBC_2.4 __pthread_register_cancel_defer F -GLIBC_2.4 __pthread_rwlock_tryrdlock F GLIBC_2.4 __pthread_rwlock_trywrlock F GLIBC_2.4 __pthread_unregister_cancel F GLIBC_2.4 __pthread_unregister_cancel_restore F @@ -44,7 +43,6 @@ GLIBC_2.4 pthread_detach F GLIBC_2.4 pthread_getconcurrency F GLIBC_2.4 pthread_getcpuclockid F GLIBC_2.4 pthread_join F -GLIBC_2.4 pthread_rwlock_tryrdlock F GLIBC_2.4 pthread_rwlock_trywrlock F GLIBC_2.4 pthread_rwlockattr_destroy F GLIBC_2.4 pthread_rwlockattr_getkind_np F diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist index 1bf0d26..adf747c 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist @@ -231,6 +231,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 @@ -586,6 +587,7 @@ GLIBC_2.4 __pthread_once F GLIBC_2.4 __pthread_rwlock_destroy F GLIBC_2.4 __pthread_rwlock_init F GLIBC_2.4 __pthread_rwlock_rdlock F +GLIBC_2.4 __pthread_rwlock_tryrdlock F GLIBC_2.4 __pthread_rwlock_unlock F GLIBC_2.4 __pthread_rwlock_wrlock F GLIBC_2.4 __pthread_setspecific F @@ -1684,6 +1686,7 @@ GLIBC_2.4 pthread_rwlock_init F GLIBC_2.4 pthread_rwlock_rdlock F GLIBC_2.4 pthread_rwlock_timedrdlock F GLIBC_2.4 pthread_rwlock_timedwrlock F +GLIBC_2.4 pthread_rwlock_tryrdlock F GLIBC_2.4 pthread_rwlock_unlock F GLIBC_2.4 pthread_rwlock_wrlock F GLIBC_2.4 pthread_self F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index f6062d3..b9f1c4b 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -15,7 +15,6 @@ GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F GLIBC_2.4 __pthread_register_cancel F GLIBC_2.4 __pthread_register_cancel_defer F -GLIBC_2.4 __pthread_rwlock_tryrdlock F GLIBC_2.4 __pthread_rwlock_trywrlock F GLIBC_2.4 __pthread_unregister_cancel F GLIBC_2.4 __pthread_unregister_cancel_restore F @@ -44,7 +43,6 @@ GLIBC_2.4 pthread_detach F GLIBC_2.4 pthread_getconcurrency F GLIBC_2.4 pthread_getcpuclockid F GLIBC_2.4 pthread_join F -GLIBC_2.4 pthread_rwlock_tryrdlock F GLIBC_2.4 pthread_rwlock_trywrlock F GLIBC_2.4 pthread_rwlockattr_destroy F GLIBC_2.4 pthread_rwlockattr_getkind_np F -- cgit v1.1