Andrew Geissler | 4c19ea1 | 2020-10-27 13:52:24 -0500 | [diff] [blame] | 1 | From d6f7b6064dc91d1d5fa18554b40b14822ab7a32b Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 16 Oct 2020 11:13:22 -0700 |
| 4 | Subject: [PATCH] fiber,libs: Define SYS_futex if it does not exist |
| 5 | |
| 6 | __NR_futex is not defines by newer architectures e.g. arc, riscv32 as |
| 7 | they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on |
| 8 | __NR_futex, since this is used in applications, such applications start |
| 9 | to fail to build for these newer architectures. This patch defines a |
| 10 | fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps |
| 11 | working |
| 12 | |
| 13 | Upstream-Status: Pending |
| 14 | |
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 16 | --- |
| 17 | boost/fiber/detail/futex.hpp | 5 +++++ |
| 18 | libs/log/src/event.cpp | 4 ++++ |
| 19 | 2 files changed, 9 insertions(+) |
| 20 | |
| 21 | diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp |
| 22 | index e64bd5990..16bee64f1 100644 |
| 23 | --- a/boost/fiber/detail/futex.hpp |
| 24 | +++ b/boost/fiber/detail/futex.hpp |
| 25 | @@ -17,6 +17,11 @@ extern "C" { |
| 26 | #include <linux/futex.h> |
| 27 | #include <sys/syscall.h> |
| 28 | } |
| 29 | + |
| 30 | +#if !defined(SYS_futex) && defined(SYS_futex_time64) |
| 31 | +#define SYS_futex SYS_futex_time64 |
| 32 | +#endif |
| 33 | + |
| 34 | #elif BOOST_OS_WINDOWS |
| 35 | #include <windows.h> |
| 36 | #endif |
| 37 | diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp |
| 38 | index 5485154d7..2c7c0381f 100644 |
| 39 | --- a/libs/log/src/event.cpp |
| 40 | +++ b/libs/log/src/event.cpp |
| 41 | @@ -31,6 +31,10 @@ |
| 42 | #include <linux/futex.h> |
| 43 | #include <boost/memory_order.hpp> |
| 44 | |
| 45 | +#if !defined(SYS_futex) && defined(SYS_futex_time64) |
| 46 | +#define SYS_futex SYS_futex_time64 |
| 47 | +#endif |
| 48 | + |
| 49 | // Some Android NDKs (Google NDK and older Crystax.NET NDK versions) don't define SYS_futex |
| 50 | #if defined(SYS_futex) |
| 51 | #define BOOST_LOG_SYS_FUTEX SYS_futex |
| 52 | -- |
| 53 | 2.28.0 |
| 54 | |