diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-10 15:05:51 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-08-24 15:04:31 -0300 |
| commit | 70746a06c2de7c8183a94379437779991d35266d (patch) | |
| tree | b409c9356c86ee9bf875f087a42a6bb56185bb58 | |
| parent | fd31691c678ada694f141f08c42feed128d7eebc (diff) | |
| download | glibc-70746a06c2de7c8183a94379437779991d35266d.tar.gz glibc-70746a06c2de7c8183a94379437779991d35266d.tar.xz glibc-70746a06c2de7c8183a94379437779991d35266d.zip | |
linux: Simplify timer_gettime
With arch-syscall.h it can now assumes the existance of either __NR_timer_gettime or __NR_time_gettime_time64. The 32-bit time_t support is now only build for !__ASSUME_TIME64_SYSCALLS. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Reviewed-by: Lukasz Majewski <lukma@denx.de>
| -rw-r--r-- | sysdeps/unix/sysv/linux/timer_gettime.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/timer_gettime.c b/sysdeps/unix/sysv/linux/timer_gettime.c index 1e07d4845b..5d31c7c864 100644 --- a/sysdeps/unix/sysv/linux/timer_gettime.c +++ b/sysdeps/unix/sysv/linux/timer_gettime.c @@ -28,27 +28,23 @@ __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value) { struct timer *kt = (struct timer *) timerid; -#ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_timer_gettime64 -# define __NR_timer_gettime64 __NR_timer_gettime -# endif - return INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid, value); -#else -# ifdef __NR_timer_gettime64 +#ifndef __NR_timer_gettime64 +# define __NR_timer_gettime64 __NR_timer_gettime +#endif int ret = INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid, value); +#ifndef __ASSUME_TIME64_SYSCALLS if (ret == 0 || errno != ENOSYS) return ret; -# endif + struct itimerspec its32; - int retval = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid, &its32); - if (retval == 0) + ret = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid, &its32); + if (ret == 0) { value->it_interval = valid_timespec_to_timespec64 (its32.it_interval); value->it_value = valid_timespec_to_timespec64 (its32.it_value); } - - return retval; #endif + return ret; } #if __TIMESIZE != 64 |