diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-10 10:04:14 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-08-24 15:04:31 -0300 |
| commit | ff6228d5c6b0fa34ecb51228be57392649ffc88e (patch) | |
| tree | 050a990ba13ca967d6507063eb852079d893e66b | |
| parent | 55399535c147d8a0e109c24435628aa6213480fc (diff) | |
| download | glibc-ff6228d5c6b0fa34ecb51228be57392649ffc88e.tar glibc-ff6228d5c6b0fa34ecb51228be57392649ffc88e.tar.gz glibc-ff6228d5c6b0fa34ecb51228be57392649ffc88e.tar.bz2 glibc-ff6228d5c6b0fa34ecb51228be57392649ffc88e.zip | |
linux: Simplify clock_settime
With arch-syscall.h it can now assumes the existance of either
__NR_clock_settime or __NR_clock_settime_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/clock_settime.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c index ebda871f4c..ce0bf622c0 100644 --- a/sysdeps/unix/sysv/linux/clock_settime.c +++ b/sysdeps/unix/sysv/linux/clock_settime.c @@ -32,17 +32,15 @@ __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp) return -1; } -#ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_clock_settime64 -# define __NR_clock_settime64 __NR_clock_settime -# endif - return INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp); -#else -# ifdef __NR_clock_settime64 +#ifndef __NR_clock_settime64 +# define __NR_clock_settime64 __NR_clock_settime +#endif int ret = INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp); + +#ifndef __ASSUME_TIME64_SYSCALLS if (ret == 0 || errno != ENOSYS) return ret; -# endif + if (! in_time_t_range (tp->tv_sec)) { __set_errno (EOVERFLOW); @@ -50,8 +48,10 @@ __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp) } struct timespec ts32 = valid_timespec64_to_timespec (*tp); - return INLINE_SYSCALL_CALL (clock_settime, clock_id, &ts32); + ret = INLINE_SYSCALL_CALL (clock_settime, clock_id, &ts32); #endif + + return ret; } #if __TIMESIZE != 64 |