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

runsv: 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:51 -07:00 committed by Denys Vlasenko
parent 902d399292
commit ad27d44ebe
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runit/runsv.c
View File

@ -55,7 +55,14 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* typically requiring -lrt. We just skip all this mess */ * typically requiring -lrt. We just skip all this mess */
static void gettimeofday_ns(struct timespec *ts) static void gettimeofday_ns(struct timespec *ts)
{ {
#if defined(__NR_clock_gettime)
syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); 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 #else
static void gettimeofday_ns(struct timespec *ts) static void gettimeofday_ns(struct timespec *ts)