diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-03 09:10:57 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-03 09:18:16 +0200 |
| commit | c96dddd7311e7ffa2a7995de5c2560d9979fd962 (patch) | |
| tree | 0aebeb973544f89fd5cbb23e874cb8076b7b6f03 /sysdeps/unix/sysv/linux/x86_64 | |
| parent | e7d2d48e560a2091e2a03c527c333cd7b5618b25 (diff) | |
| download | glibc-c96dddd7311e7ffa2a7995de5c2560d9979fd962.tar.gz glibc-c96dddd7311e7ffa2a7995de5c2560d9979fd962.tar.xz glibc-c96dddd7311e7ffa2a7995de5c2560d9979fd962.zip | |
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 <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86_64')
4 files changed, 6 insertions, 4 deletions
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 diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index d7316a9364..19546e256c 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -354,6 +354,7 @@ GLIBC_2.16 __pthread_once F GLIBC_2.16 __pthread_rwlock_destroy F GLIBC_2.16 __pthread_rwlock_init F GLIBC_2.16 __pthread_rwlock_rdlock F +GLIBC_2.16 __pthread_rwlock_tryrdlock F GLIBC_2.16 __pthread_rwlock_unlock F GLIBC_2.16 __pthread_rwlock_wrlock F GLIBC_2.16 __pthread_setspecific F @@ -1514,6 +1515,7 @@ GLIBC_2.16 pthread_rwlock_init F GLIBC_2.16 pthread_rwlock_rdlock F GLIBC_2.16 pthread_rwlock_timedrdlock F GLIBC_2.16 pthread_rwlock_timedwrlock F +GLIBC_2.16 pthread_rwlock_tryrdlock F GLIBC_2.16 pthread_rwlock_unlock F GLIBC_2.16 pthread_rwlock_wrlock F GLIBC_2.16 pthread_self F @@ -2331,6 +2333,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/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index bdb532d02f..48b6e79a0e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -4,7 +4,6 @@ GLIBC_2.16 _IO_funlockfile F GLIBC_2.16 __errno_location F GLIBC_2.16 __pthread_register_cancel F GLIBC_2.16 __pthread_register_cancel_defer F -GLIBC_2.16 __pthread_rwlock_tryrdlock F GLIBC_2.16 __pthread_rwlock_trywrlock F GLIBC_2.16 __pthread_unregister_cancel F GLIBC_2.16 __pthread_unregister_cancel_restore F @@ -34,7 +33,6 @@ GLIBC_2.16 pthread_getconcurrency F GLIBC_2.16 pthread_getcpuclockid F GLIBC_2.16 pthread_getname_np F GLIBC_2.16 pthread_join F -GLIBC_2.16 pthread_rwlock_tryrdlock F GLIBC_2.16 pthread_rwlock_trywrlock F GLIBC_2.16 pthread_rwlockattr_destroy F GLIBC_2.16 pthread_rwlockattr_getkind_np F |