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 --- sysdeps/unix/sysv/linux/mtx_timedlock.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'sysdeps/unix/sysv/linux/mtx_timedlock.c') diff --git a/sysdeps/unix/sysv/linux/mtx_timedlock.c b/sysdeps/unix/sysv/linux/mtx_timedlock.c index e39735691f..7715ebb315 100644 --- a/sysdeps/unix/sysv/linux/mtx_timedlock.c +++ b/sysdeps/unix/sysv/linux/mtx_timedlock.c @@ -17,27 +17,34 @@ . */ #include +#include #include "thrd_priv.h" int -__mtx_timedlock64 (mtx_t *restrict mutex, - const struct __timespec64 *restrict time_point) +___mtx_timedlock64 (mtx_t *restrict mutex, + const struct __timespec64 *restrict time_point) { int err_code = __pthread_mutex_timedlock64 ((pthread_mutex_t *)mutex, time_point); return thrd_err_map (err_code); } -#if __TIMESIZE != 64 -libpthread_hidden_def (__mtx_timedlock64) +#if __TIMESIZE == 64 +strong_alias (___mtx_timedlock64, ___mtx_timedlock) +#else +libc_hidden_ver (___mtx_timedlock64, __mtx_timedlock64) int -__mtx_timedlock (mtx_t *restrict mutex, - const struct timespec *restrict time_point) +___mtx_timedlock (mtx_t *restrict mutex, + const struct timespec *restrict time_point) { struct __timespec64 ts64 = valid_timespec_to_timespec64 (*time_point); return __mtx_timedlock64 (mutex, &ts64); } +#endif /* __TIMESIZE == 64 */ +versioned_symbol (libc, ___mtx_timedlock, mtx_timedlock, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, ___mtx_timedlock, mtx_timedlock, GLIBC_2_28); #endif -weak_alias (__mtx_timedlock, mtx_timedlock) -- cgit 1.4.1