From eb29dcde31e7b6f07e7acda161e85d2be69652e4 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 21 Apr 2021 19:49:51 +0200 Subject: nptl: Move rwlock functions with forwarders into libc The forwarders were only used internally, so new symbol versions are needed. All symbols are moved at once because the forwarders are no-ops if libpthread is not loaded, leading to inconsistencies in case of a partial migration. The symbols __pthread_rwlock_rdlock, __pthread_rwlock_unlock, __pthread_rwlock_wrlock, pthread_rwlock_rdlock, pthread_rwlock_unlock, pthread_rwlock_wrlock have been moved using scripts/move-symbol-to-libc.py. The __ symbol variants are turned into compat symbols, which is why they do not receive a GLIBC_2.34 version. --- sysdeps/unix/sysv/linux/arm/be/libc.abilist | 9 +++++++++ sysdeps/unix/sysv/linux/arm/be/libpthread.abilist | 6 ------ sysdeps/unix/sysv/linux/arm/le/libc.abilist | 9 +++++++++ sysdeps/unix/sysv/linux/arm/le/libpthread.abilist | 6 ------ 4 files changed, 18 insertions(+), 12 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 c33623caf8..770e1d99ea 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist @@ -169,6 +169,9 @@ GLIBC_2.34 pthread_key_delete F GLIBC_2.34 pthread_kill F GLIBC_2.34 pthread_mutex_consistent F GLIBC_2.34 pthread_once F +GLIBC_2.34 pthread_rwlock_rdlock F +GLIBC_2.34 pthread_rwlock_unlock F +GLIBC_2.34 pthread_rwlock_wrlock F GLIBC_2.34 pthread_setspecific F GLIBC_2.4 _Exit F GLIBC_2.4 _IO_2_1_stderr_ D 0xa0 @@ -501,6 +504,9 @@ GLIBC_2.4 __pthread_cleanup_routine F GLIBC_2.4 __pthread_getspecific F GLIBC_2.4 __pthread_key_create F GLIBC_2.4 __pthread_once F +GLIBC_2.4 __pthread_rwlock_rdlock F +GLIBC_2.4 __pthread_rwlock_unlock F +GLIBC_2.4 __pthread_rwlock_wrlock F GLIBC_2.4 __pthread_setspecific F GLIBC_2.4 __pthread_unwind_next F GLIBC_2.4 __ptsname_r_chk F @@ -1569,6 +1575,9 @@ GLIBC_2.4 pthread_mutex_init F GLIBC_2.4 pthread_mutex_lock F GLIBC_2.4 pthread_mutex_unlock F GLIBC_2.4 pthread_once F +GLIBC_2.4 pthread_rwlock_rdlock F +GLIBC_2.4 pthread_rwlock_unlock F +GLIBC_2.4 pthread_rwlock_wrlock F GLIBC_2.4 pthread_self F GLIBC_2.4 pthread_setcancelstate F GLIBC_2.4 pthread_setcanceltype F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index aab1587c4d..c2705e7057 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -49,11 +49,8 @@ GLIBC_2.4 __pthread_register_cancel F GLIBC_2.4 __pthread_register_cancel_defer 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_trywrlock F -GLIBC_2.4 __pthread_rwlock_unlock F -GLIBC_2.4 __pthread_rwlock_wrlock F GLIBC_2.4 __pthread_unregister_cancel F GLIBC_2.4 __pthread_unregister_cancel_restore F GLIBC_2.4 __res_state F @@ -115,13 +112,10 @@ GLIBC_2.4 pthread_mutexattr_setrobust_np F GLIBC_2.4 pthread_mutexattr_settype 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_timedrdlock F GLIBC_2.4 pthread_rwlock_timedwrlock F GLIBC_2.4 pthread_rwlock_tryrdlock F GLIBC_2.4 pthread_rwlock_trywrlock F -GLIBC_2.4 pthread_rwlock_unlock F -GLIBC_2.4 pthread_rwlock_wrlock F GLIBC_2.4 pthread_rwlockattr_destroy F GLIBC_2.4 pthread_rwlockattr_getkind_np F GLIBC_2.4 pthread_rwlockattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist index 16b39ebb07..4f6a853967 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist @@ -166,6 +166,9 @@ GLIBC_2.34 pthread_key_delete F GLIBC_2.34 pthread_kill F GLIBC_2.34 pthread_mutex_consistent F GLIBC_2.34 pthread_once F +GLIBC_2.34 pthread_rwlock_rdlock F +GLIBC_2.34 pthread_rwlock_unlock F +GLIBC_2.34 pthread_rwlock_wrlock F GLIBC_2.34 pthread_setspecific F GLIBC_2.4 _Exit F GLIBC_2.4 _IO_2_1_stderr_ D 0xa0 @@ -498,6 +501,9 @@ GLIBC_2.4 __pthread_cleanup_routine F GLIBC_2.4 __pthread_getspecific F GLIBC_2.4 __pthread_key_create F GLIBC_2.4 __pthread_once F +GLIBC_2.4 __pthread_rwlock_rdlock F +GLIBC_2.4 __pthread_rwlock_unlock F +GLIBC_2.4 __pthread_rwlock_wrlock F GLIBC_2.4 __pthread_setspecific F GLIBC_2.4 __pthread_unwind_next F GLIBC_2.4 __ptsname_r_chk F @@ -1566,6 +1572,9 @@ GLIBC_2.4 pthread_mutex_init F GLIBC_2.4 pthread_mutex_lock F GLIBC_2.4 pthread_mutex_unlock F GLIBC_2.4 pthread_once F +GLIBC_2.4 pthread_rwlock_rdlock F +GLIBC_2.4 pthread_rwlock_unlock F +GLIBC_2.4 pthread_rwlock_wrlock F GLIBC_2.4 pthread_self F GLIBC_2.4 pthread_setcancelstate F GLIBC_2.4 pthread_setcanceltype F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index aab1587c4d..c2705e7057 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -49,11 +49,8 @@ GLIBC_2.4 __pthread_register_cancel F GLIBC_2.4 __pthread_register_cancel_defer 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_trywrlock F -GLIBC_2.4 __pthread_rwlock_unlock F -GLIBC_2.4 __pthread_rwlock_wrlock F GLIBC_2.4 __pthread_unregister_cancel F GLIBC_2.4 __pthread_unregister_cancel_restore F GLIBC_2.4 __res_state F @@ -115,13 +112,10 @@ GLIBC_2.4 pthread_mutexattr_setrobust_np F GLIBC_2.4 pthread_mutexattr_settype 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_timedrdlock F GLIBC_2.4 pthread_rwlock_timedwrlock F GLIBC_2.4 pthread_rwlock_tryrdlock F GLIBC_2.4 pthread_rwlock_trywrlock F -GLIBC_2.4 pthread_rwlock_unlock F -GLIBC_2.4 pthread_rwlock_wrlock F GLIBC_2.4 pthread_rwlockattr_destroy F GLIBC_2.4 pthread_rwlockattr_getkind_np F GLIBC_2.4 pthread_rwlockattr_getpshared F -- cgit 1.4.1