From c6e359dbc7bd155b10e15616d11e15c48b8bbefa Mon Sep 17 00:00:00 2001 From: Dmitry Chestnykh Date: Wed, 28 Feb 2024 11:45:09 +0300 Subject: libc: Pass 64bit-only time structures to syscalls. With time64 enabled we need to pass structure which consists of two 64bit fields to clock_gettime64() and clock_nanosleep_time64() syscalls with proper conversion to regular timespec structure after syscall execution. Signed-off-by: Dmitry Chestnykh --- libpthread/nptl/pthread_mutex_timedlock.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'libpthread/nptl/pthread_mutex_timedlock.c') diff --git a/libpthread/nptl/pthread_mutex_timedlock.c b/libpthread/nptl/pthread_mutex_timedlock.c index d54983315..1191639b6 100644 --- a/libpthread/nptl/pthread_mutex_timedlock.c +++ b/libpthread/nptl/pthread_mutex_timedlock.c @@ -298,11 +298,19 @@ pthread_mutex_timedlock ( /* Delay the thread until the timeout is reached. Then return ETIMEDOUT. */ struct timespec reltime; - struct timespec now; +#if defined(__UCLIBC_USE_TIME64__) + struct __ts64_struct __now64; +#endif + struct timespec now = {.tv_sec = 0, .tv_nsec = 0}; #if defined(__UCLIBC_USE_TIME64__) && defined(__NR_clock_gettime64) - INTERNAL_SYSCALL (clock_gettime64, __err, 2, CLOCK_REALTIME, - &now); + int __r = INTERNAL_SYSCALL (clock_gettime64, __err, 2, CLOCK_REALTIME, + &__now64); + + if (__r == 0) { + now.tv_sec = __now64.tv_sec; + now.tv_nsec = __now64.tv_nsec; + } #else INTERNAL_SYSCALL (clock_gettime, __err, 2, CLOCK_REALTIME, &now); -- cgit v1.2.3