diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:12:11 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:15:58 +0200 |
| commit | 08970190fc225b319ba456f621a62a50858fa0f6 (patch) | |
| tree | d926adc67470162c0b933270987f08c37b1ff7fd /sysdeps/unix/sysv/linux/csky | |
| parent | 032a9e17a7201765228262b9b6731839dcfdf885 (diff) | |
| download | glibc-08970190fc225b319ba456f621a62a50858fa0f6.tar glibc-08970190fc225b319ba456f621a62a50858fa0f6.tar.gz glibc-08970190fc225b319ba456f621a62a50858fa0f6.tar.bz2 glibc-08970190fc225b319ba456f621a62a50858fa0f6.zip | |
nptl: Move mtx_trylock into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
The __pthread_mutex_trylock@@GLIBC_2.34 symbol version is no longer
needed because the call is now internal to libc, so remove it with
this commit.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/csky')
| -rw-r--r-- | sysdeps/unix/sysv/linux/csky/libc.abilist | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/csky/libpthread.abilist | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist index bc2f526474..a7df6f64fe 100644 --- a/sysdeps/unix/sysv/linux/csky/libc.abilist +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist @@ -1322,6 +1322,7 @@ GLIBC_2.29 mtx_destroy F GLIBC_2.29 mtx_init F GLIBC_2.29 mtx_lock F GLIBC_2.29 mtx_timedlock F +GLIBC_2.29 mtx_trylock F GLIBC_2.29 munlock F GLIBC_2.29 munlockall F GLIBC_2.29 munmap F @@ -2195,7 +2196,6 @@ GLIBC_2.34 __pthread_cleanup_routine F GLIBC_2.34 __pthread_getspecific F GLIBC_2.34 __pthread_key_create 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_setspecific F GLIBC_2.34 __pthread_unwind_next F @@ -2210,6 +2210,7 @@ GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F GLIBC_2.34 mtx_lock F GLIBC_2.34 mtx_timedlock F +GLIBC_2.34 mtx_trylock F GLIBC_2.34 pthread_cond_clockwait F GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index 832e5dbab9..59658bc168 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -13,7 +13,6 @@ GLIBC_2.29 __pthread_unregister_cancel_restore F GLIBC_2.29 flockfile F GLIBC_2.29 ftrylockfile F GLIBC_2.29 funlockfile F -GLIBC_2.29 mtx_trylock F GLIBC_2.29 mtx_unlock F GLIBC_2.29 pthread_attr_getaffinity_np F GLIBC_2.29 pthread_attr_getguardsize F |