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/arm/be/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/arm/be/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/arm/le/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/arm/le/libpthread.abilist | 2 -- 4 files changed, 8 insertions(+), 4 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 8da492d8ca..c3f20ed586 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist @@ -165,6 +165,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 @@ -179,6 +180,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 @@ -517,6 +519,7 @@ GLIBC_2.4 __pthread_key_create F GLIBC_2.4 __pthread_mutex_destroy F GLIBC_2.4 __pthread_mutex_init F GLIBC_2.4 __pthread_mutex_lock F +GLIBC_2.4 __pthread_mutex_trylock F GLIBC_2.4 __pthread_mutex_unlock F GLIBC_2.4 __pthread_once F GLIBC_2.4 __pthread_rwlock_rdlock F @@ -1592,6 +1595,7 @@ GLIBC_2.4 pthread_mutex_init F GLIBC_2.4 pthread_mutex_lock F GLIBC_2.4 pthread_mutex_setprioceiling F GLIBC_2.4 pthread_mutex_timedlock F +GLIBC_2.4 pthread_mutex_trylock F GLIBC_2.4 pthread_mutex_unlock F GLIBC_2.4 pthread_once F GLIBC_2.4 pthread_rwlock_rdlock F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index f14634cece..467ddab8aa 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -35,7 +35,6 @@ GLIBC_2.4 _IO_ftrylockfile F GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F GLIBC_2.4 __h_errno_location F -GLIBC_2.4 __pthread_mutex_trylock F GLIBC_2.4 __pthread_mutexattr_destroy F GLIBC_2.4 __pthread_mutexattr_init F GLIBC_2.4 __pthread_mutexattr_settype F @@ -77,7 +76,6 @@ GLIBC_2.4 pthread_detach F GLIBC_2.4 pthread_getconcurrency F GLIBC_2.4 pthread_getcpuclockid F GLIBC_2.4 pthread_join F -GLIBC_2.4 pthread_mutex_trylock F GLIBC_2.4 pthread_mutexattr_destroy F GLIBC_2.4 pthread_mutexattr_getkind_np F GLIBC_2.4 pthread_mutexattr_getprioceiling F diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist index c0d4321177..89298285bf 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist @@ -162,6 +162,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 @@ -176,6 +177,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 @@ -514,6 +516,7 @@ GLIBC_2.4 __pthread_key_create F GLIBC_2.4 __pthread_mutex_destroy F GLIBC_2.4 __pthread_mutex_init F GLIBC_2.4 __pthread_mutex_lock F +GLIBC_2.4 __pthread_mutex_trylock F GLIBC_2.4 __pthread_mutex_unlock F GLIBC_2.4 __pthread_once F GLIBC_2.4 __pthread_rwlock_rdlock F @@ -1589,6 +1592,7 @@ GLIBC_2.4 pthread_mutex_init F GLIBC_2.4 pthread_mutex_lock F GLIBC_2.4 pthread_mutex_setprioceiling F GLIBC_2.4 pthread_mutex_timedlock F +GLIBC_2.4 pthread_mutex_trylock F GLIBC_2.4 pthread_mutex_unlock F GLIBC_2.4 pthread_once F GLIBC_2.4 pthread_rwlock_rdlock F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index f14634cece..467ddab8aa 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -35,7 +35,6 @@ GLIBC_2.4 _IO_ftrylockfile F GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F GLIBC_2.4 __h_errno_location F -GLIBC_2.4 __pthread_mutex_trylock F GLIBC_2.4 __pthread_mutexattr_destroy F GLIBC_2.4 __pthread_mutexattr_init F GLIBC_2.4 __pthread_mutexattr_settype F @@ -77,7 +76,6 @@ GLIBC_2.4 pthread_detach F GLIBC_2.4 pthread_getconcurrency F GLIBC_2.4 pthread_getcpuclockid F GLIBC_2.4 pthread_join F -GLIBC_2.4 pthread_mutex_trylock F GLIBC_2.4 pthread_mutexattr_destroy F GLIBC_2.4 pthread_mutexattr_getkind_np F GLIBC_2.4 pthread_mutexattr_getprioceiling F -- cgit 1.4.1