diff options
| author | Alistair Francis | 2019-09-18 09:28:51 -0700 |
|---|---|---|
| committer | Denys Vlasenko | 2019-10-08 16:31:54 +0200 |
| commit | ad27d44ebe950335616f37e36863469dc181b455 (patch) | |
| tree | 2b7908945364f3106f94678f06259742b3c68321 | |
| parent | 902d3992922fc8db8495d5fb30a4581711b60c62 (diff) | |
| download | busybox-ad27d44ebe950335616f37e36863469dc181b455.zip busybox-ad27d44ebe950335616f37e36863469dc181b455.tar.gz | |
runsv: 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>
| -rw-r--r-- | runit/runsv.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/runit/runsv.c b/runit/runsv.c index ccc762d..737909b 100644 --- a/runit/runsv.c +++ b/runit/runsv.c @@ -55,7 +55,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * typically requiring -lrt. We just skip all this mess */ static void gettimeofday_ns(struct timespec *ts) { +#if defined(__NR_clock_gettime) syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); +#elif __TIMESIZE == 64 + syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts); +#else +# error "We currently don't support architectures without " \ + "the __NR_clock_gettime syscall and 32-bit time_t" +#endif } #else static void gettimeofday_ns(struct timespec *ts) |