| Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 1 | From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 15 Nov 2020 12:10:28 -0800 |
| 4 | Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t |
| 5 | |
| 6 | mutex code uses SYS_futex, which it expects from system C library. |
| 7 | in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) |
| 8 | rv32 is using 64bit time_t from get go unlike other 32bit architectures |
| 9 | in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 |
| 10 | this aliases it to NR_futex so that SYS_futex is then defined for rv32 |
| 11 | |
| 12 | Upstream-Status: Submitted [https://github.com/capnproto/capnproto/pull/1103] |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | c++/src/kj/mutex.c++ | 6 ++++++ |
| 16 | 1 file changed, 6 insertions(+) |
| 17 | |
| 18 | diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ |
| 19 | index c81cead7..e1594b11 100644 |
| 20 | --- a/c++/src/kj/mutex.c++ |
| 21 | +++ b/c++/src/kj/mutex.c++ |
| 22 | @@ -39,7 +39,13 @@ |
| 23 | |
| 24 | #ifndef SYS_futex |
| 25 | // Missing on Android/Bionic. |
| 26 | +#ifdef __NR_futex |
| 27 | #define SYS_futex __NR_futex |
| 28 | +#elif defined(SYS_futex_time64) |
| 29 | +#define SYS_futex SYS_futex_time64 |
| 30 | +#else |
| 31 | +#error "Need working SYS_futex" |
| 32 | +#endif |
| 33 | #endif |
| 34 | |
| 35 | #ifndef FUTEX_WAIT_PRIVATE |
| 36 | -- |
| 37 | 2.29.2 |
| 38 | |