From 032a9e17a7201765228262b9b6731839dcfdf885 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 08:12:11 +0200 Subject: 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 Tested-by: Carlos O'Donell --- nptl/pthread_mutex_timedlock.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'nptl/pthread_mutex_timedlock.c') 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 @@ -631,11 +631,13 @@ ___pthread_mutex_timedlock (pthread_mutex_t *mutex, return __pthread_mutex_timedlock64 (mutex, &ts64); } #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); -- cgit v1.2.3