From a2b0f2e1864f03084138a105e1d5f2cf86a62425 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 23 Apr 2021 09:44:23 +0200 Subject: nptl: Move pthread_mutex_trylock, __pthread_mutex_trylock into libc The symbols were moved using scripts/move-symbol-to-libc.py. __pthread_mutex_trylock is used to implement mtx_timedlock, which still resides in libpthread, so add a GLIBC_2.34 version for it, to match the existing GLIBC_2.0 version. --- sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist | 4 ++++ 6 files changed, 16 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 6c753dc3dc..2c1572e8e3 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -188,6 +188,7 @@ GLIBC_2.0 __pthread_key_create F GLIBC_2.0 __pthread_mutex_destroy F GLIBC_2.0 __pthread_mutex_init F GLIBC_2.0 __pthread_mutex_lock F +GLIBC_2.0 __pthread_mutex_trylock F GLIBC_2.0 __pthread_mutex_unlock F GLIBC_2.0 __pthread_once F GLIBC_2.0 __pthread_setspecific F @@ -877,6 +878,7 @@ GLIBC_2.0 pthread_kill_other_threads_np F GLIBC_2.0 pthread_mutex_destroy F GLIBC_2.0 pthread_mutex_init F GLIBC_2.0 pthread_mutex_lock F +GLIBC_2.0 pthread_mutex_trylock F GLIBC_2.0 pthread_mutex_unlock F GLIBC_2.0 pthread_once F GLIBC_2.0 pthread_self F @@ -2196,6 +2198,7 @@ GLIBC_2.34 __pthread_key_create F GLIBC_2.34 __pthread_mutex_destroy F GLIBC_2.34 __pthread_mutex_init F GLIBC_2.34 __pthread_mutex_lock F +GLIBC_2.34 __pthread_mutex_trylock F GLIBC_2.34 __pthread_mutex_unlock F GLIBC_2.34 __pthread_once F GLIBC_2.34 __pthread_setspecific F @@ -2210,6 +2213,7 @@ GLIBC_2.34 pthread_mutex_consistent F GLIBC_2.34 pthread_mutex_getprioceiling F GLIBC_2.34 pthread_mutex_setprioceiling F GLIBC_2.34 pthread_mutex_timedlock F +GLIBC_2.34 pthread_mutex_trylock F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index a9ebb70bd8..6ecd4e507b 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F GLIBC_2.0 __h_errno_location F -GLIBC_2.0 __pthread_mutex_trylock F GLIBC_2.0 __pthread_mutexattr_destroy F GLIBC_2.0 __pthread_mutexattr_init F GLIBC_2.0 __pthread_mutexattr_settype F @@ -14,7 +13,6 @@ GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F GLIBC_2.0 pthread_join F -GLIBC_2.0 pthread_mutex_trylock F GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist index 92fa2476d4..3de9fffaa3 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -188,6 +188,7 @@ GLIBC_2.0 __pthread_key_create F GLIBC_2.0 __pthread_mutex_destroy F GLIBC_2.0 __pthread_mutex_init F GLIBC_2.0 __pthread_mutex_lock F +GLIBC_2.0 __pthread_mutex_trylock F GLIBC_2.0 __pthread_mutex_unlock F GLIBC_2.0 __pthread_once F GLIBC_2.0 __pthread_setspecific F @@ -877,6 +878,7 @@ GLIBC_2.0 pthread_kill_other_threads_np F GLIBC_2.0 pthread_mutex_destroy F GLIBC_2.0 pthread_mutex_init F GLIBC_2.0 pthread_mutex_lock F +GLIBC_2.0 pthread_mutex_trylock F GLIBC_2.0 pthread_mutex_unlock F GLIBC_2.0 pthread_once F GLIBC_2.0 pthread_self F @@ -2194,6 +2196,7 @@ GLIBC_2.34 __pthread_key_create F GLIBC_2.34 __pthread_mutex_destroy F GLIBC_2.34 __pthread_mutex_init F GLIBC_2.34 __pthread_mutex_lock F +GLIBC_2.34 __pthread_mutex_trylock F GLIBC_2.34 __pthread_mutex_unlock F GLIBC_2.34 __pthread_once F GLIBC_2.34 __pthread_setspecific F @@ -2208,6 +2211,7 @@ GLIBC_2.34 pthread_mutex_consistent F GLIBC_2.34 pthread_mutex_getprioceiling F GLIBC_2.34 pthread_mutex_setprioceiling F GLIBC_2.34 pthread_mutex_timedlock F +GLIBC_2.34 pthread_mutex_trylock F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index a9ebb70bd8..6ecd4e507b 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F GLIBC_2.0 __h_errno_location F -GLIBC_2.0 __pthread_mutex_trylock F GLIBC_2.0 __pthread_mutexattr_destroy F GLIBC_2.0 __pthread_mutexattr_init F GLIBC_2.0 __pthread_mutexattr_settype F @@ -14,7 +13,6 @@ GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F GLIBC_2.0 pthread_join F -GLIBC_2.0 pthread_mutex_trylock F GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist index 1959a689ba..d678ebc762 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist @@ -188,6 +188,7 @@ GLIBC_2.0 __pthread_key_create F GLIBC_2.0 __pthread_mutex_destroy F GLIBC_2.0 __pthread_mutex_init F GLIBC_2.0 __pthread_mutex_lock F +GLIBC_2.0 __pthread_mutex_trylock F GLIBC_2.0 __pthread_mutex_unlock F GLIBC_2.0 __pthread_once F GLIBC_2.0 __pthread_setspecific F @@ -877,6 +878,7 @@ GLIBC_2.0 pthread_kill_other_threads_np F GLIBC_2.0 pthread_mutex_destroy F GLIBC_2.0 pthread_mutex_init F GLIBC_2.0 pthread_mutex_lock F +GLIBC_2.0 pthread_mutex_trylock F GLIBC_2.0 pthread_mutex_unlock F GLIBC_2.0 pthread_once F GLIBC_2.0 pthread_self F @@ -2202,6 +2204,7 @@ GLIBC_2.34 __pthread_key_create F GLIBC_2.34 __pthread_mutex_destroy F GLIBC_2.34 __pthread_mutex_init F GLIBC_2.34 __pthread_mutex_lock F +GLIBC_2.34 __pthread_mutex_trylock F GLIBC_2.34 __pthread_mutex_unlock F GLIBC_2.34 __pthread_once F GLIBC_2.34 __pthread_setspecific F @@ -2216,6 +2219,7 @@ GLIBC_2.34 pthread_mutex_consistent F GLIBC_2.34 pthread_mutex_getprioceiling F GLIBC_2.34 pthread_mutex_setprioceiling F GLIBC_2.34 pthread_mutex_timedlock F +GLIBC_2.34 pthread_mutex_trylock F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index 2961e3c440..d621003007 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -188,6 +188,7 @@ GLIBC_2.0 __pthread_key_create F GLIBC_2.0 __pthread_mutex_destroy F GLIBC_2.0 __pthread_mutex_init F GLIBC_2.0 __pthread_mutex_lock F +GLIBC_2.0 __pthread_mutex_trylock F GLIBC_2.0 __pthread_mutex_unlock F GLIBC_2.0 __pthread_once F GLIBC_2.0 __pthread_setspecific F @@ -875,6 +876,7 @@ GLIBC_2.0 pthread_kill_other_threads_np F GLIBC_2.0 pthread_mutex_destroy F GLIBC_2.0 pthread_mutex_init F GLIBC_2.0 pthread_mutex_lock F +GLIBC_2.0 pthread_mutex_trylock F GLIBC_2.0 pthread_mutex_unlock F GLIBC_2.0 pthread_once F GLIBC_2.0 pthread_self F @@ -2196,6 +2198,7 @@ GLIBC_2.34 __pthread_key_create F GLIBC_2.34 __pthread_mutex_destroy F GLIBC_2.34 __pthread_mutex_init F GLIBC_2.34 __pthread_mutex_lock F +GLIBC_2.34 __pthread_mutex_trylock F GLIBC_2.34 __pthread_mutex_unlock F GLIBC_2.34 __pthread_once F GLIBC_2.34 __pthread_setspecific F @@ -2210,6 +2213,7 @@ GLIBC_2.34 pthread_mutex_consistent F GLIBC_2.34 pthread_mutex_getprioceiling F GLIBC_2.34 pthread_mutex_setprioceiling F GLIBC_2.34 pthread_mutex_timedlock F +GLIBC_2.34 pthread_mutex_trylock F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F -- cgit 1.4.1