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/mips/mips32/fpu/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist | 3 +++ 6 files changed, 12 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/mips') diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist index bc546ac..4b42bdd 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -1547,6 +1547,7 @@ GLIBC_2.2 __pread64 F GLIBC_2.2 __pthread_rwlock_destroy F GLIBC_2.2 __pthread_rwlock_init F GLIBC_2.2 __pthread_rwlock_rdlock F +GLIBC_2.2 __pthread_rwlock_tryrdlock F GLIBC_2.2 __pthread_rwlock_unlock F GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F @@ -1848,6 +1849,7 @@ GLIBC_2.2 pthread_rwlock_init F GLIBC_2.2 pthread_rwlock_rdlock F GLIBC_2.2 pthread_rwlock_timedrdlock F GLIBC_2.2 pthread_rwlock_timedwrlock F +GLIBC_2.2 pthread_rwlock_tryrdlock F GLIBC_2.2 pthread_rwlock_unlock F GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 pthread_spin_destroy F @@ -2293,6 +2295,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/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index cf43d9d..b3e68c1 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -21,7 +21,6 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.2 __pthread_rwlock_tryrdlock F GLIBC_2.2 __pthread_rwlock_trywrlock F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F @@ -40,7 +39,6 @@ GLIBC_2.2 pthread_barrierattr_setpshared F GLIBC_2.2 pthread_create F GLIBC_2.2 pthread_getconcurrency F GLIBC_2.2 pthread_getcpuclockid F -GLIBC_2.2 pthread_rwlock_tryrdlock F GLIBC_2.2 pthread_rwlock_trywrlock F GLIBC_2.2 pthread_rwlockattr_destroy F GLIBC_2.2 pthread_rwlockattr_getkind_np F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist index f5552f7..3093e02 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -1545,6 +1545,7 @@ GLIBC_2.2 __pread64 F GLIBC_2.2 __pthread_rwlock_destroy F GLIBC_2.2 __pthread_rwlock_init F GLIBC_2.2 __pthread_rwlock_rdlock F +GLIBC_2.2 __pthread_rwlock_tryrdlock F GLIBC_2.2 __pthread_rwlock_unlock F GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F @@ -1846,6 +1847,7 @@ GLIBC_2.2 pthread_rwlock_init F GLIBC_2.2 pthread_rwlock_rdlock F GLIBC_2.2 pthread_rwlock_timedrdlock F GLIBC_2.2 pthread_rwlock_timedwrlock F +GLIBC_2.2 pthread_rwlock_tryrdlock F GLIBC_2.2 pthread_rwlock_unlock F GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 pthread_spin_destroy F @@ -2291,6 +2293,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/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index cf43d9d..b3e68c1 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -21,7 +21,6 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.2 __pthread_rwlock_tryrdlock F GLIBC_2.2 __pthread_rwlock_trywrlock F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F @@ -40,7 +39,6 @@ GLIBC_2.2 pthread_barrierattr_setpshared F GLIBC_2.2 pthread_create F GLIBC_2.2 pthread_getconcurrency F GLIBC_2.2 pthread_getcpuclockid F -GLIBC_2.2 pthread_rwlock_tryrdlock F GLIBC_2.2 pthread_rwlock_trywrlock F GLIBC_2.2 pthread_rwlockattr_destroy F GLIBC_2.2 pthread_rwlockattr_getkind_np F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist index 448ac38..371602d 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist @@ -1545,6 +1545,7 @@ GLIBC_2.2 __pread64 F GLIBC_2.2 __pthread_rwlock_destroy F GLIBC_2.2 __pthread_rwlock_init F GLIBC_2.2 __pthread_rwlock_rdlock F +GLIBC_2.2 __pthread_rwlock_tryrdlock F GLIBC_2.2 __pthread_rwlock_unlock F GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F @@ -1846,6 +1847,7 @@ GLIBC_2.2 pthread_rwlock_init F GLIBC_2.2 pthread_rwlock_rdlock F GLIBC_2.2 pthread_rwlock_timedrdlock F GLIBC_2.2 pthread_rwlock_timedwrlock F +GLIBC_2.2 pthread_rwlock_tryrdlock F GLIBC_2.2 pthread_rwlock_unlock F GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 pthread_spin_destroy F @@ -2299,6 +2301,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/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index 1837184..6935218 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -1541,6 +1541,7 @@ GLIBC_2.2 __pread64 F GLIBC_2.2 __pthread_rwlock_destroy F GLIBC_2.2 __pthread_rwlock_init F GLIBC_2.2 __pthread_rwlock_rdlock F +GLIBC_2.2 __pthread_rwlock_tryrdlock F GLIBC_2.2 __pthread_rwlock_unlock F GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F @@ -1842,6 +1843,7 @@ GLIBC_2.2 pthread_rwlock_init F GLIBC_2.2 pthread_rwlock_rdlock F GLIBC_2.2 pthread_rwlock_timedrdlock F GLIBC_2.2 pthread_rwlock_timedwrlock F +GLIBC_2.2 pthread_rwlock_tryrdlock F GLIBC_2.2 pthread_rwlock_unlock F GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 pthread_spin_destroy F @@ -2293,6 +2295,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 -- cgit v1.1