ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwclock: fix SYS_settimeofday fallback 

turns out this is subtly broken. musl 1.2.x for 64-bit architectures defines __NR_settimeofday but not
for 32-bit ones. For 32-bit, it defines a _time32 variant.
This commit is contained in:
Rosen Penev 2020-08-29 21:55:58 -07:00 committed by GitHub
parent 76054e1527
commit fdac67ae14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys-utils/hwclock.c
View File

@ -675,8 +675,12 @@ display_time(struct timeval hwctime)
*/
#define __set_time(_tv) settimeofday(_tv, NULL)
#if !defined(SYS_settimeofday) && defined(__NR_settimeofday)
# define SYS_settimeofday __NR_settimeofday
#ifndef SYS_settimeofday
# ifdef __NR_settimeofday
# define SYS_settimeofday __NR_settimeofday
# else
# define SYS_settimeofday __NR_settimeofday_time32
# endif
#endif
static inline int __set_timezone(const struct timezone *tz)