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/x86_64/64 | |
| parent | 4372dc7eaaa81fc04554626b7f02c9759a04a65b (diff) | |
| download | glibc-a2b0f2e1864f03084138a105e1d5f2cf86a62425.tar.gz 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/unix/sysv/linux/x86_64/64')
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 2a089dc275..5597978b7b 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -363,6 +363,7 @@ GLIBC_2.2.5 __pthread_key_create F GLIBC_2.2.5 __pthread_mutex_destroy F GLIBC_2.2.5 __pthread_mutex_init F GLIBC_2.2.5 __pthread_mutex_lock F +GLIBC_2.2.5 __pthread_mutex_trylock F GLIBC_2.2.5 __pthread_mutex_unlock F GLIBC_2.2.5 __pthread_once F GLIBC_2.2.5 __pthread_rwlock_rdlock F @@ -1307,6 +1308,7 @@ GLIBC_2.2.5 pthread_mutex_destroy F GLIBC_2.2.5 pthread_mutex_init F GLIBC_2.2.5 pthread_mutex_lock F GLIBC_2.2.5 pthread_mutex_timedlock F +GLIBC_2.2.5 pthread_mutex_trylock F GLIBC_2.2.5 pthread_mutex_unlock F GLIBC_2.2.5 pthread_once F GLIBC_2.2.5 pthread_rwlock_rdlock F @@ -2129,6 +2131,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 @@ -2143,6 +2146,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/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index 22e6696aae..052b3a1c4a 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -10,7 +10,6 @@ GLIBC_2.2.5 _IO_ftrylockfile F GLIBC_2.2.5 _IO_funlockfile F GLIBC_2.2.5 __errno_location F GLIBC_2.2.5 __h_errno_location F -GLIBC_2.2.5 __pthread_mutex_trylock F GLIBC_2.2.5 __pthread_mutexattr_destroy F GLIBC_2.2.5 __pthread_mutexattr_init F GLIBC_2.2.5 __pthread_mutexattr_settype F @@ -44,7 +43,6 @@ GLIBC_2.2.5 pthread_detach F GLIBC_2.2.5 pthread_getconcurrency F GLIBC_2.2.5 pthread_getcpuclockid F GLIBC_2.2.5 pthread_join F -GLIBC_2.2.5 pthread_mutex_trylock F GLIBC_2.2.5 pthread_mutexattr_destroy F GLIBC_2.2.5 pthread_mutexattr_getkind_np F GLIBC_2.2.5 pthread_mutexattr_getpshared F |