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/unix/sysv/linux/i386 | |
| parent | 4372dc7eaaa81fc04554626b7f02c9759a04a65b (diff) | |
| download | glibc-a2b0f2e1864f03084138a105e1d5f2cf86a62425.tar glibc-a2b0f2e1864f03084138a105e1d5f2cf86a62425.tar.gz glibc-a2b0f2e1864f03084138a105e1d5f2cf86a62425.tar.bz2 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/unix/sysv/linux/i386')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/libc.abilist | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/libpthread.abilist | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist index 25c9f351b7..c0f97e2edc 100644 --- a/sysdeps/unix/sysv/linux/i386/libc.abilist +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist @@ -190,6 +190,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 @@ -881,6 +882,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 @@ -2290,6 +2292,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 @@ -2304,6 +2307,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/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index e0d809b8ed..14849531d5 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/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 |