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/sh/le/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/sh/le/libpthread.abilist | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/sh/le') diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist index a819b034f8..2b248630c3 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist @@ -364,6 +364,7 @@ GLIBC_2.2 __pthread_key_create F GLIBC_2.2 __pthread_mutex_destroy F GLIBC_2.2 __pthread_mutex_init F GLIBC_2.2 __pthread_mutex_lock F +GLIBC_2.2 __pthread_mutex_trylock F GLIBC_2.2 __pthread_mutex_unlock F GLIBC_2.2 __pthread_once F GLIBC_2.2 __pthread_rwlock_rdlock F @@ -1296,6 +1297,7 @@ GLIBC_2.2 pthread_mutex_destroy F GLIBC_2.2 pthread_mutex_init F GLIBC_2.2 pthread_mutex_lock F GLIBC_2.2 pthread_mutex_timedlock F +GLIBC_2.2 pthread_mutex_trylock F GLIBC_2.2 pthread_mutex_unlock F GLIBC_2.2 pthread_once F GLIBC_2.2 pthread_rwlock_rdlock F @@ -2117,6 +2119,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 @@ -2131,6 +2134,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/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index 2b6a8795cb..ba390c95a9 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -10,7 +10,6 @@ GLIBC_2.2 _IO_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F GLIBC_2.2 __h_errno_location F -GLIBC_2.2 __pthread_mutex_trylock F GLIBC_2.2 __pthread_mutexattr_destroy F GLIBC_2.2 __pthread_mutexattr_init F GLIBC_2.2 __pthread_mutexattr_settype F @@ -44,7 +43,6 @@ GLIBC_2.2 pthread_detach F GLIBC_2.2 pthread_getconcurrency F GLIBC_2.2 pthread_getcpuclockid F GLIBC_2.2 pthread_join F -GLIBC_2.2 pthread_mutex_trylock F GLIBC_2.2 pthread_mutexattr_destroy F GLIBC_2.2 pthread_mutexattr_getkind_np F GLIBC_2.2 pthread_mutexattr_getpshared F -- cgit 1.4.1