From e8a9597159168db43289da50433af0ba3d8a7f92 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 09:10:57 +0200 Subject: nptl: Move pthread_rwlock_trywrlock into libc And __pthread_rwlock_trywrlock as a compatibility symbol. Remove the unused __libc_rwlock_trywrlock 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 4b42bdd..3f8c849 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -1548,6 +1548,7 @@ 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_trywrlock F GLIBC_2.2 __pthread_rwlock_unlock F GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F @@ -1850,6 +1851,7 @@ 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_trywrlock F GLIBC_2.2 pthread_rwlock_unlock F GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 pthread_spin_destroy F @@ -2296,6 +2298,7 @@ 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_trywrlock 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 b3e68c1..8c66a99 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_trywrlock F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F GLIBC_2.2 pthread_attr_getstackaddr F @@ -39,7 +38,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_trywrlock F GLIBC_2.2 pthread_rwlockattr_destroy F GLIBC_2.2 pthread_rwlockattr_getkind_np F GLIBC_2.2 pthread_rwlockattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist index 3093e02..633564e 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -1546,6 +1546,7 @@ 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_trywrlock 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_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_trywrlock F GLIBC_2.2 pthread_rwlock_unlock F GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 pthread_spin_destroy F @@ -2294,6 +2296,7 @@ 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_trywrlock 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 b3e68c1..8c66a99 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_trywrlock F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F GLIBC_2.2 pthread_attr_getstackaddr F @@ -39,7 +38,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_trywrlock F GLIBC_2.2 pthread_rwlockattr_destroy F GLIBC_2.2 pthread_rwlockattr_getkind_np F GLIBC_2.2 pthread_rwlockattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist index 371602d..5aff235 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist @@ -1546,6 +1546,7 @@ 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_trywrlock 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_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_trywrlock F GLIBC_2.2 pthread_rwlock_unlock F GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 pthread_spin_destroy F @@ -2302,6 +2304,7 @@ 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_trywrlock 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 6935218..e178138 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -1542,6 +1542,7 @@ 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_trywrlock F GLIBC_2.2 __pthread_rwlock_unlock F GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F @@ -1844,6 +1845,7 @@ 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_trywrlock F GLIBC_2.2 pthread_rwlock_unlock F GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 pthread_spin_destroy F @@ -2296,6 +2298,7 @@ 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_trywrlock F GLIBC_2.34 pthread_rwlock_unlock F GLIBC_2.34 pthread_rwlock_wrlock F GLIBC_2.34 pthread_setspecific F -- cgit v1.1