0002-time-Use-64-prefix-syscall-if-we-have-to.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. From b18253c4fe09f80906ac996c148035d8731cef60 Mon Sep 17 00:00:00 2001
  2. From: Alistair Francis <alistair.francis@wdc.com>
  3. Date: Tue, 27 Aug 2019 17:15:09 -0700
  4. Subject: [PATCH 2/3] time: Use 64 prefix syscall if we have to
  5. Some 32-bit architectures no longer have the 32-bit time_t syscalls.
  6. Instead they have suffixed syscalls that returns a 64-bit time_t. If
  7. the architecture doesn't have the non-suffixed syscall and is using a
  8. 64-bit time_t let's use the suffixed syscall instead.
  9. This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel
  10. headers.
  11. If an architecture only supports the suffixed syscalls, but is still
  12. using a 32-bit time_t report a compilation error. This avoids us have to
  13. deal with converting between 64-bit and 32-bit values. There are
  14. currently no architectures where this is the case.
  15. Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
  16. Upstream-Status: Submitted
  17. ---
  18. libbb/time.c | 7 +++++++
  19. 1 file changed, 7 insertions(+)
  20. diff --git a/libbb/time.c b/libbb/time.c
  21. index cab0ad602..b6fcae28b 100644
  22. --- a/libbb/time.c
  23. +++ b/libbb/time.c
  24. @@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
  25. * typically requiring -lrt. We just skip all this mess */
  26. static void get_mono(struct timespec *ts)
  27. {
  28. +#if defined(__NR_clock_gettime)
  29. if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
  30. +#elif __TIMESIZE == 64
  31. + if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts))
  32. +#else
  33. +# error "We currently don't support architectures without " \
  34. + "the __NR_clock_gettime syscall and 32-bit time_t"
  35. +#endif
  36. bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
  37. }
  38. unsigned long long FAST_FUNC monotonic_ns(void)
  39. --
  40. 2.22.0