aboutsummaryrefslogtreecommitdiff
path: root/nptl/pthread_mutex_timedlock.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-03 08:12:11 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-03 08:15:53 +0200
commit032a9e17a7201765228262b9b6731839dcfdf885 (patch)
tree22f8e89d7709cd57c64edb27f065fa10c7c45880 /nptl/pthread_mutex_timedlock.c
parentb7863c732e387032a49b21e9800e1755beaf5e10 (diff)
downloadglibc-032a9e17a7201765228262b9b6731839dcfdf885.tar
glibc-032a9e17a7201765228262b9b6731839dcfdf885.tar.gz
glibc-032a9e17a7201765228262b9b6731839dcfdf885.tar.bz2
glibc-032a9e17a7201765228262b9b6731839dcfdf885.zip
nptl: Move mtx_timedlock into libc
The symbol was moved using scripts/move-symbol-to-libc.py. The __pthread_mutex_timedlock@@GLIBC_PRIVATE export is no longer needed, so it is removed 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_timedlock.c')
-rw-r--r--nptl/pthread_mutex_timedlock.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
index b9cc0a24a1..acd78131b2 100644
--- a/nptl/pthread_mutex_timedlock.c
+++ b/nptl/pthread_mutex_timedlock.c
@@ -632,10 +632,12 @@ ___pthread_mutex_timedlock (pthread_mutex_t *mutex,
}
#endif /* __TIMESPEC64 != 64 */
versioned_symbol (libc, ___pthread_mutex_timedlock,
- __pthread_mutex_timedlock, GLIBC_PRIVATE);
-libc_hidden_ver (___pthread_mutex_timedlock, __pthread_mutex_timedlock)
-versioned_symbol (libc, ___pthread_mutex_timedlock,
pthread_mutex_timedlock, GLIBC_2_34);
+libc_hidden_ver (___pthread_mutex_timedlock, __pthread_mutex_timedlock)
+#ifndef SHARED
+strong_alias (___pthread_mutex_timedlock, __pthread_mutex_timedlock)
+#endif
+
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34)
compat_symbol (libpthread, ___pthread_mutex_timedlock,
pthread_mutex_timedlock, GLIBC_2_2);