From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 30 Aug 2020 04:55:58 +0000 (-0700)
Subject: hwclock: fix SYS_settimeofday fallback
X-Git-Tag: v2.36.1~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=802d7992db30a79eaba645a13a07cf77c8f888f5;p=thirdparty%2Futil-linux.git

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.
---

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index ac74549d74..c1cfbd3949 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -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)