summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorAlistair Francis2019-09-18 09:28:50 -0700
committerDenys Vlasenko2019-10-08 16:31:54 +0200
commit902d3992922fc8db8495d5fb30a4581711b60c62 (patch)
tree530d1a3a8d51229c2382c4b922ee286a49470b70 /libbb
parentb7b7452f292f03eefafa6fd1da9bcfc933dee15a (diff)
downloadbusybox-902d3992922fc8db8495d5fb30a4581711b60c62.zip
busybox-902d3992922fc8db8495d5fb30a4581711b60c62.tar.gz
time: Use 64 prefix syscall if we have to
Some 32-bit architectures no longer have the 32-bit time_t syscalls. Instead they have suffixed syscalls that returns a 64-bit time_t. If the architecture doesn't have the non-suffixed syscall and is using a 64-bit time_t let's use the suffixed syscall instead. This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel headers. If an architecture only supports the suffixed syscalls, but is still using a 32-bit time_t report a compilation error. This avoids us have to deal with converting between 64-bit and 32-bit values. There are currently no architectures where this is the case. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/time.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libbb/time.c b/libbb/time.c
index cab0ad6..b6fcae2 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
* typically requiring -lrt. We just skip all this mess */
static void get_mono(struct timespec *ts)
{
+#if defined(__NR_clock_gettime)
if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
+#elif __TIMESIZE == 64
+ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts))
+#else
+# error "We currently don't support architectures without " \
+ "the __NR_clock_gettime syscall and 32-bit time_t"
+#endif
bb_simple_error_msg_and_die("clock_gettime(MONOTONIC) failed");
}
unsigned long long FAST_FUNC monotonic_ns(void)