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/s390 | |
| parent | 032a9e17a7201765228262b9b6731839dcfdf885 (diff) | |
| download | glibc-08970190fc225b319ba456f621a62a50858fa0f6.zip glibc-08970190fc225b319ba456f621a62a50858fa0f6.tar.gz glibc-08970190fc225b319ba456f621a62a50858fa0f6.tar.bz2 | |
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/s390')
4 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index 95448b3..0c1f06f 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -2072,6 +2072,7 @@ GLIBC_2.28 mtx_destroy F GLIBC_2.28 mtx_init F GLIBC_2.28 mtx_lock F GLIBC_2.28 mtx_timedlock F +GLIBC_2.28 mtx_trylock F GLIBC_2.28 renameat2 F GLIBC_2.28 statx F GLIBC_2.28 thrd_current F @@ -2291,7 +2292,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 @@ -2306,6 +2306,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/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index ebe9630..90c504f 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -70,7 +70,6 @@ GLIBC_2.2 pthread_yield F GLIBC_2.2 sem_timedwait F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F -GLIBC_2.28 mtx_trylock F GLIBC_2.28 mtx_unlock F GLIBC_2.28 thrd_create F GLIBC_2.28 thrd_detach F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 6da442b..0f0f889 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -1969,6 +1969,7 @@ GLIBC_2.28 mtx_destroy F GLIBC_2.28 mtx_init F GLIBC_2.28 mtx_lock F GLIBC_2.28 mtx_timedlock F +GLIBC_2.28 mtx_trylock F GLIBC_2.28 renameat2 F GLIBC_2.28 statx F GLIBC_2.28 thrd_current F @@ -2184,7 +2185,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 @@ -2199,6 +2199,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/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index 3825650..c448c78 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -62,7 +62,6 @@ GLIBC_2.2 sem_unlink F GLIBC_2.2 sem_wait F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F -GLIBC_2.28 mtx_trylock F GLIBC_2.28 mtx_unlock F GLIBC_2.28 thrd_create F GLIBC_2.28 thrd_detach F |