1From ddcc8a9f7e0f0bfee96f2f0a0c10f21f9fa9b05d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Nov 2020 15:02:28 -0800
4Subject: [PATCH] folly: Use SYS_futex for syscall
5
6glibc defines SYS_futex and on newer 32bit CPUs like RISCV-32, arc there
7is no 32bit time_t therefore define SYS_futex in terms of SYS_futex_time64
8
9Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7676]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 third-party/folly/folly/detail/Futex.cpp | 10 ++++++++--
13 1 file changed, 8 insertions(+), 2 deletions(-)
14
15--- a/third-party/folly/folly/detail/Futex.cpp
16+++ b/third-party/folly/folly/detail/Futex.cpp
17@@ -48,9 +48,15 @@ namespace {
18 #define FUTEX_CLOCK_REALTIME 256
19 #endif
20
21+/// Newer 32bit CPUs eg. RISCV-32 are defaulting to 64bit time_t from get go and
22+/// therefore do not define __NR_futex
23+#if !defined(SYS_futex) && defined(SYS_futex_time64)
24+# define SYS_futex SYS_futex_time64
25+#endif
26+
27 int nativeFutexWake(const void* addr, int count, uint32_t wakeMask) {
28   long rv = syscall(
29-      __NR_futex,
30+      SYS_futex,
31       addr, /* addr1 */
32       FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG, /* op */
33       count, /* val */
34@@ -112,7 +118,7 @@ FutexResult nativeFutexWaitImpl(
35   // Unlike FUTEX_WAIT, FUTEX_WAIT_BITSET requires an absolute timeout
36   // value - http://locklessinc.com/articles/futex_cheat_sheet/
37   long rv = syscall(
38-      __NR_futex,
39+      SYS_futex,
40       addr, /* addr1 */
41       op, /* op */
42       expected, /* val */
43