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 /nptl/pthread_mutex_trylock.c | |
| parent | 032a9e17a7201765228262b9b6731839dcfdf885 (diff) | |
| download | glibc-08970190fc225b319ba456f621a62a50858fa0f6.tar.gz glibc-08970190fc225b319ba456f621a62a50858fa0f6.tar.xz 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 'nptl/pthread_mutex_trylock.c')
| -rw-r--r-- | nptl/pthread_mutex_trylock.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c index 623ea75db0..b61cdb94f4 100644 --- a/nptl/pthread_mutex_trylock.c +++ b/nptl/pthread_mutex_trylock.c @@ -449,11 +449,13 @@ ___pthread_mutex_trylock (pthread_mutex_t *mutex) return EBUSY; } -libc_hidden_ver (___pthread_mutex_trylock, __pthread_mutex_trylock) versioned_symbol (libc, ___pthread_mutex_trylock, pthread_mutex_trylock, GLIBC_2_34); -versioned_symbol (libc, ___pthread_mutex_trylock, - __pthread_mutex_trylock, GLIBC_2_34); +libc_hidden_ver (___pthread_mutex_trylock, __pthread_mutex_trylock) +#ifndef SHARED +strong_alias (___pthread_mutex_trylock, __pthread_mutex_trylock) +#endif + #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) compat_symbol (libpthread, ___pthread_mutex_trylock, pthread_mutex_trylock, GLIBC_2_0); |