emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

time: Use 64 prefix syscall if we have to

Browse Source 
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>
This commit is contained in:
Alistair Francis 2019-09-18 09:28:50 -07:00 committed by Denys Vlasenko
parent b7b7452f29
commit 902d399292
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libbb/time.c
View File

@ -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 */ * typically requiring -lrt. We just skip all this mess */
static void get_mono(struct timespec *ts) static void get_mono(struct timespec *ts)
{ {
#if defined(__NR_clock_gettime)
if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) 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"); bb_simple_error_msg_and_die("clock_gettime(MONOTONIC) failed");
} }
unsigned long long FAST_FUNC monotonic_ns(void) unsigned long long FAST_FUNC monotonic_ns(void)