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/mips/mips32/fpu/libc.abilist | 9 +++++++++ sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist | 6 ------ sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist | 9 +++++++++ sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist | 6 ------ sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist | 9 +++++++++ sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist | 9 +++++++++ 6 files changed, 36 insertions(+), 12 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 04d6813672..2fb12516f0 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -1527,6 +1527,9 @@ GLIBC_2.2 __nl_langinfo_l F GLIBC_2.2 __open64 F GLIBC_2.2 __poll F GLIBC_2.2 __pread64 F +GLIBC_2.2 __pthread_rwlock_rdlock F +GLIBC_2.2 __pthread_rwlock_unlock F +GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F GLIBC_2.2 __rawmemchr F GLIBC_2.2 __res_init F @@ -1814,6 +1817,9 @@ GLIBC_2.2 pread64 F GLIBC_2.2 printf_size F GLIBC_2.2 printf_size_info F GLIBC_2.2 pthread_attr_init F +GLIBC_2.2 pthread_rwlock_rdlock F +GLIBC_2.2 pthread_rwlock_unlock F +GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 ptsname F GLIBC_2.2 ptsname_r F GLIBC_2.2 putgrent F @@ -2187,6 +2193,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 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index e4897828f2..ecb2aabcd3 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -49,11 +49,8 @@ GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np 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_trywrlock F -GLIBC_2.2 __pthread_rwlock_unlock F -GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __res_state F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F @@ -81,13 +78,10 @@ GLIBC_2.2 pthread_mutexattr_setpshared F GLIBC_2.2 pthread_mutexattr_settype 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_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_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 935f87bbbc..e9c8f34ef2 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -1525,6 +1525,9 @@ GLIBC_2.2 __nl_langinfo_l F GLIBC_2.2 __open64 F GLIBC_2.2 __poll F GLIBC_2.2 __pread64 F +GLIBC_2.2 __pthread_rwlock_rdlock F +GLIBC_2.2 __pthread_rwlock_unlock F +GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F GLIBC_2.2 __rawmemchr F GLIBC_2.2 __res_init F @@ -1812,6 +1815,9 @@ GLIBC_2.2 pread64 F GLIBC_2.2 printf_size F GLIBC_2.2 printf_size_info F GLIBC_2.2 pthread_attr_init F +GLIBC_2.2 pthread_rwlock_rdlock F +GLIBC_2.2 pthread_rwlock_unlock F +GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 ptsname F GLIBC_2.2 ptsname_r F GLIBC_2.2 putgrent F @@ -2185,6 +2191,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 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index e4897828f2..ecb2aabcd3 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -49,11 +49,8 @@ GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np 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_trywrlock F -GLIBC_2.2 __pthread_rwlock_unlock F -GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __res_state F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F @@ -81,13 +78,10 @@ GLIBC_2.2 pthread_mutexattr_setpshared F GLIBC_2.2 pthread_mutexattr_settype 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_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_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 ff01b5abcf..a2d981c726 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist @@ -1525,6 +1525,9 @@ GLIBC_2.2 __nl_langinfo_l F GLIBC_2.2 __open64 F GLIBC_2.2 __poll F GLIBC_2.2 __pread64 F +GLIBC_2.2 __pthread_rwlock_rdlock F +GLIBC_2.2 __pthread_rwlock_unlock F +GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F GLIBC_2.2 __rawmemchr F GLIBC_2.2 __res_init F @@ -1812,6 +1815,9 @@ GLIBC_2.2 pread64 F GLIBC_2.2 printf_size F GLIBC_2.2 printf_size_info F GLIBC_2.2 pthread_attr_init F +GLIBC_2.2 pthread_rwlock_rdlock F +GLIBC_2.2 pthread_rwlock_unlock F +GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 ptsname F GLIBC_2.2 ptsname_r F GLIBC_2.2 putgrent F @@ -2193,6 +2199,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 __confstr_chk F GLIBC_2.4 __fgets_chk F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index 57ff176ce0..ffc935b34b 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -1521,6 +1521,9 @@ GLIBC_2.2 __nl_langinfo_l F GLIBC_2.2 __open64 F GLIBC_2.2 __poll F GLIBC_2.2 __pread64 F +GLIBC_2.2 __pthread_rwlock_rdlock F +GLIBC_2.2 __pthread_rwlock_unlock F +GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pwrite64 F GLIBC_2.2 __rawmemchr F GLIBC_2.2 __res_init F @@ -1808,6 +1811,9 @@ GLIBC_2.2 pread64 F GLIBC_2.2 printf_size F GLIBC_2.2 printf_size_info F GLIBC_2.2 pthread_attr_init F +GLIBC_2.2 pthread_rwlock_rdlock F +GLIBC_2.2 pthread_rwlock_unlock F +GLIBC_2.2 pthread_rwlock_wrlock F GLIBC_2.2 ptsname F GLIBC_2.2 ptsname_r F GLIBC_2.2 putgrent F @@ -2187,6 +2193,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 __confstr_chk F GLIBC_2.4 __fgets_chk F -- cgit v1.2.3-70-g09d2