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/powerpc/powerpc32/fpu/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist | 2 -- 7 files changed, 12 insertions(+), 6 deletions(-) (limited to 'sysdeps/unix/sysv/linux/powerpc') diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist index 66b22e0..ba0bb38 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist @@ -1581,6 +1581,7 @@ GLIBC_2.1 pthread_mutexattr_settype F GLIBC_2.1 pthread_rwlock_destroy F GLIBC_2.1 pthread_rwlock_init F GLIBC_2.1 pthread_rwlock_rdlock F +GLIBC_2.1 pthread_rwlock_tryrdlock F GLIBC_2.1 pthread_rwlock_unlock F GLIBC_2.1 pthread_rwlock_wrlock F GLIBC_2.1 ptsname F @@ -1856,6 +1857,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 @@ -2357,6 +2359,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/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index b4e3db9..b242935 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.1 pthread_attr_setstackaddr F GLIBC_2.1 pthread_attr_setstacksize F GLIBC_2.1 pthread_create F GLIBC_2.1 pthread_getconcurrency F -GLIBC_2.1 pthread_rwlock_tryrdlock F GLIBC_2.1 pthread_rwlock_trywrlock F GLIBC_2.1 pthread_rwlockattr_destroy F GLIBC_2.1 pthread_rwlockattr_getkind_np F @@ -48,7 +47,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_getstack F GLIBC_2.2 pthread_attr_setstack F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist index 0bb28f8..fe87f6c 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist @@ -1581,6 +1581,7 @@ GLIBC_2.1 pthread_mutexattr_settype F GLIBC_2.1 pthread_rwlock_destroy F GLIBC_2.1 pthread_rwlock_init F GLIBC_2.1 pthread_rwlock_rdlock F +GLIBC_2.1 pthread_rwlock_tryrdlock F GLIBC_2.1 pthread_rwlock_unlock F GLIBC_2.1 pthread_rwlock_wrlock F GLIBC_2.1 ptsname F @@ -1860,6 +1861,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 @@ -2390,6 +2392,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/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist index 9037797..a8b87f5 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist @@ -443,6 +443,7 @@ GLIBC_2.3 __pthread_once F GLIBC_2.3 __pthread_rwlock_destroy F GLIBC_2.3 __pthread_rwlock_init F GLIBC_2.3 __pthread_rwlock_rdlock F +GLIBC_2.3 __pthread_rwlock_tryrdlock F GLIBC_2.3 __pthread_rwlock_unlock F GLIBC_2.3 __pthread_rwlock_wrlock F GLIBC_2.3 __pthread_setspecific F @@ -1442,6 +1443,7 @@ GLIBC_2.3 pthread_rwlock_init F GLIBC_2.3 pthread_rwlock_rdlock F GLIBC_2.3 pthread_rwlock_timedrdlock F GLIBC_2.3 pthread_rwlock_timedwrlock F +GLIBC_2.3 pthread_rwlock_tryrdlock F GLIBC_2.3 pthread_rwlock_unlock F GLIBC_2.3 pthread_rwlock_wrlock F GLIBC_2.3 pthread_self F @@ -2211,6 +2213,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/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index 50983e3..06a3c2a 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -10,7 +10,6 @@ GLIBC_2.3 _IO_flockfile F GLIBC_2.3 _IO_ftrylockfile F GLIBC_2.3 _IO_funlockfile F GLIBC_2.3 __errno_location F -GLIBC_2.3 __pthread_rwlock_tryrdlock F GLIBC_2.3 __pthread_rwlock_trywrlock F GLIBC_2.3 flockfile F GLIBC_2.3 ftrylockfile F @@ -35,7 +34,6 @@ GLIBC_2.3 pthread_detach F GLIBC_2.3 pthread_getconcurrency F GLIBC_2.3 pthread_getcpuclockid F GLIBC_2.3 pthread_join F -GLIBC_2.3 pthread_rwlock_tryrdlock F GLIBC_2.3 pthread_rwlock_trywrlock F GLIBC_2.3 pthread_rwlockattr_destroy F GLIBC_2.3 pthread_rwlockattr_getkind_np F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist index b235e44..8aa450c 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist @@ -439,6 +439,7 @@ GLIBC_2.17 __pthread_once F GLIBC_2.17 __pthread_rwlock_destroy F GLIBC_2.17 __pthread_rwlock_init F GLIBC_2.17 __pthread_rwlock_rdlock F +GLIBC_2.17 __pthread_rwlock_tryrdlock F GLIBC_2.17 __pthread_rwlock_unlock F GLIBC_2.17 __pthread_rwlock_wrlock F GLIBC_2.17 __pthread_setspecific F @@ -1595,6 +1596,7 @@ GLIBC_2.17 pthread_rwlock_init F GLIBC_2.17 pthread_rwlock_rdlock F GLIBC_2.17 pthread_rwlock_timedrdlock F GLIBC_2.17 pthread_rwlock_timedwrlock F +GLIBC_2.17 pthread_rwlock_tryrdlock F GLIBC_2.17 pthread_rwlock_unlock F GLIBC_2.17 pthread_rwlock_wrlock F GLIBC_2.17 pthread_self F @@ -2512,6 +2514,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/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index 37bbc8a..6db0066 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -4,7 +4,6 @@ GLIBC_2.17 _IO_funlockfile F GLIBC_2.17 __errno_location F GLIBC_2.17 __pthread_register_cancel F GLIBC_2.17 __pthread_register_cancel_defer F -GLIBC_2.17 __pthread_rwlock_tryrdlock F GLIBC_2.17 __pthread_rwlock_trywrlock F GLIBC_2.17 __pthread_unregister_cancel F GLIBC_2.17 __pthread_unregister_cancel_restore F @@ -34,7 +33,6 @@ GLIBC_2.17 pthread_getconcurrency F GLIBC_2.17 pthread_getcpuclockid F GLIBC_2.17 pthread_getname_np F GLIBC_2.17 pthread_join F -GLIBC_2.17 pthread_rwlock_tryrdlock F GLIBC_2.17 pthread_rwlock_trywrlock F GLIBC_2.17 pthread_rwlockattr_destroy F GLIBC_2.17 pthread_rwlockattr_getkind_np F -- cgit v1.1