From 04e28fdda03b545a0f7b446a784ec2fa7249cbb8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 29 Apr 2020 15:37:40 -0700 Subject: [PATCH] Fix build on riscv32 Define __NR_mmap in terms of __NR_mmap2 and __NR_futex interms of __NR_futex_time64 for rv32, since there calls dont exist for rv32 Also recognise rv32 as a new 32bit platform Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/675] Signed-off-by: Khem Raj --- absl/base/internal/direct_mmap.h | 5 +++++ absl/base/internal/spinlock_linux.inc | 4 ++++ absl/synchronization/internal/waiter.cc | 4 ++++ 3 files changed, 13 insertions(+) --- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h +++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h @@ -26,6 +26,10 @@ #ifdef __linux__ +#if !defined(__NR_mmap) && defined(__riscv) && __riscv_xlen == 32 +# define __NR_mmap __NR_mmap2 +#endif + #include #ifdef __BIONIC__ #include @@ -72,6 +76,7 @@ inline void* DirectMmap(void* start, siz #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \ (defined(__PPC__) && !defined(__PPC64__)) || \ + (defined(__riscv) && __riscv_xlen == 32) || \ (defined(__s390__) && !defined(__s390x__)) // On these architectures, implement mmap with mmap2. static int pagesize = 0; --- a/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc +++ b/third_party/abseil-cpp/absl/base/internal/spinlock_linux.inc @@ -14,6 +14,10 @@ // // This file is a Linux-specific part of spinlock_wait.cc +#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 +# define __NR_futex __NR_futex_time64 +#endif + #include #include #include --- a/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc +++ b/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc @@ -24,6 +24,10 @@ #include #endif +#if !defined(__NR_futex) && defined(__riscv) && __riscv_xlen == 32 +# define __NR_futex __NR_futex_time64 +#endif + #ifdef __linux__ #include #include