1*4882a593SmuzhiyunFrom e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 15 Nov 2020 12:10:28 -0800 4*4882a593SmuzhiyunSubject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunmutex code uses SYS_futex, which it expects from system C library. 7*4882a593Smuzhiyunin glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) 8*4882a593Smuzhiyunrv32 is using 64bit time_t from get go unlike other 32bit architectures 9*4882a593Smuzhiyunin glibc, therefore it wont have NR_futex defined but just NR_futex_time64 10*4882a593Smuzhiyunthis aliases it to NR_futex so that SYS_futex is then defined for rv32 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 13*4882a593Smuzhiyun[Retrieved from: 14*4882a593Smuzhiyunhttps://github.com/capnproto/capnproto/commit/e2a05a19e9dc51287e19cc9f11fd91449219e361] 15*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun c++/src/kj/mutex.c++ | 6 ++++++ 18*4882a593Smuzhiyun 1 file changed, 6 insertions(+) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ 21*4882a593Smuzhiyunindex c81cead7b..e1594b117 100644 22*4882a593Smuzhiyun--- a/c++/src/kj/mutex.c++ 23*4882a593Smuzhiyun+++ b/c++/src/kj/mutex.c++ 24*4882a593Smuzhiyun@@ -39,7 +39,13 @@ 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun #ifndef SYS_futex 27*4882a593Smuzhiyun // Missing on Android/Bionic. 28*4882a593Smuzhiyun+#ifdef __NR_futex 29*4882a593Smuzhiyun #define SYS_futex __NR_futex 30*4882a593Smuzhiyun+#elif defined(SYS_futex_time64) 31*4882a593Smuzhiyun+#define SYS_futex SYS_futex_time64 32*4882a593Smuzhiyun+#else 33*4882a593Smuzhiyun+#error "Need working SYS_futex" 34*4882a593Smuzhiyun+#endif 35*4882a593Smuzhiyun #endif 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun #ifndef FUTEX_WAIT_PRIVATE 38