diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:44:23 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:44:23 +0200 |
| commit | a2b0f2e1864f03084138a105e1d5f2cf86a62425 (patch) | |
| tree | 1bfe09513168993ce36a56ddd605053b653f1c35 /sysdeps | |
| parent | 4372dc7eaaa81fc04554626b7f02c9759a04a65b (diff) | |
| download | glibc-a2b0f2e1864f03084138a105e1d5f2cf86a62425.tar.xz glibc-a2b0f2e1864f03084138a105e1d5f2cf86a62425.zip | |
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.
Diffstat (limited to 'sysdeps')
61 files changed, 128 insertions, 58 deletions
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 1e5d4dc976..087eacdfc0 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -344,6 +344,7 @@ GLIBC_2.17 __pthread_key_create F GLIBC_2.17 __pthread_mutex_destroy F GLIBC_2.17 __pthread_mutex_init F GLIBC_2.17 __pthread_mutex_lock F +GLIBC_2.17 __pthread_mutex_trylock F GLIBC_2.17 __pthread_mutex_unlock F GLIBC_2.17 __pthread_once F GLIBC_2.17 __pthread_rwlock_rdlock F @@ -1473,6 +1474,7 @@ GLIBC_2.17 pthread_mutex_init F GLIBC_2.17 pthread_mutex_lock F GLIBC_2.17 pthread_mutex_setprioceiling F GLIBC_2.17 pthread_mutex_timedlock F +GLIBC_2.17 pthread_mutex_trylock F GLIBC_2.17 pthread_mutex_unlock F GLIBC_2.17 pthread_once F GLIBC_2.17 pthread_rwlock_rdlock F @@ -2213,6 +2215,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 @@ -2227,6 +2230,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/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index c88a4c9209..5472ccdf3c 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.17 _IO_ftrylockfile F GLIBC_2.17 _IO_funlockfile F GLIBC_2.17 __errno_location F GLIBC_2.17 __h_errno_location F -GLIBC_2.17 __pthread_mutex_trylock F GLIBC_2.17 __pthread_mutexattr_destroy F GLIBC_2.17 __pthread_mutexattr_init F GLIBC_2.17 __pthread_mutexattr_settype F @@ -46,7 +45,6 @@ GLIBC_2.17 pthread_getconcurrency F GLIBC_2.17 pthread_getcpuclockid F GLIBC_2.17 pthread_getname_np F GLIBC_2.17 pthread_join F -GLIBC_2.17 pthread_mutex_trylock F GLIBC_2.17 pthread_mutexattr_destroy F GLIBC_2.17 pthread_mutexattr_getkind_np F GLIBC_2.17 pthread_mutexattr_getprioceiling F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index d2cae0f74b..b611d9ffed 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -193,6 +193,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 @@ -904,6 +905,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 @@ -2300,6 +2302,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 @@ -2314,6 +2317,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/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 913449ee16..ea3ab478c3 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/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/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index 8bc64f56ec..e497148055 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -333,6 +333,7 @@ GLIBC_2.32 __pthread_key_create F GLIBC_2.32 __pthread_mutex_destroy F GLIBC_2.32 __pthread_mutex_init F GLIBC_2.32 __pthread_mutex_lock F +GLIBC_2.32 __pthread_mutex_trylock F GLIBC_2.32 __pthread_mutex_unlock F GLIBC_2.32 __pthread_once F GLIBC_2.32 __pthread_rwlock_rdlock F @@ -1401,6 +1402,7 @@ GLIBC_2.32 pthread_mutex_init F GLIBC_2.32 pthread_mutex_lock F GLIBC_2.32 pthread_mutex_setprioceiling F GLIBC_2.32 pthread_mutex_timedlock F +GLIBC_2.32 pthread_mutex_trylock F GLIBC_2.32 pthread_mutex_unlock F GLIBC_2.32 pthread_once F GLIBC_2.32 pthread_rwlock_rdlock F @@ -1972,6 +1974,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 @@ -1986,6 +1989,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/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist index 3b8dfea67e..a71b2a40bd 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.32 _IO_ftrylockfile F GLIBC_2.32 _IO_funlockfile F GLIBC_2.32 __errno_location F GLIBC_2.32 __h_errno_location F -GLIBC_2.32 __pthread_mutex_trylock F GLIBC_2.32 __pthread_mutexattr_destroy F GLIBC_2.32 __pthread_mutexattr_init F |