1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

boost: Fix build on 32-bit arches with 64bit time_t only

(From OE-Core rev: 7a218adf9990f5e18d0b6a33eb34091969f979c7)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2020-10-16 11:30:22 -07:00
committed by Richard Purdie
parent bd56c17ba5
commit 8f03a64edd
2 changed files with 55 additions and 0 deletions
@@ -0,0 +1,54 @@
From d6f7b6064dc91d1d5fa18554b40b14822ab7a32b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 16 Oct 2020 11:13:22 -0700
Subject: [PATCH] fiber,libs: Define SYS_futex if it does not exist
__NR_futex is not defines by newer architectures e.g. arc, riscv32 as
they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on
__NR_futex, since this is used in applications, such applications start
to fail to build for these newer architectures. This patch defines a
fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps
working
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
boost/fiber/detail/futex.hpp | 5 +++++
libs/log/src/event.cpp | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp
index e64bd5990..16bee64f1 100644
--- a/boost/fiber/detail/futex.hpp
+++ b/boost/fiber/detail/futex.hpp
@@ -17,6 +17,11 @@ extern "C" {
#include <linux/futex.h>
#include <sys/syscall.h>
}
+
+#if !defined(SYS_futex) && defined(SYS_futex_time64)
+#define SYS_futex SYS_futex_time64
+#endif
+
#elif BOOST_OS_WINDOWS
#include <windows.h>
#endif
diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp
index 5485154d7..2c7c0381f 100644
--- a/libs/log/src/event.cpp
+++ b/libs/log/src/event.cpp
@@ -31,6 +31,10 @@
#include <linux/futex.h>
#include <boost/memory_order.hpp>
+#if !defined(SYS_futex) && defined(SYS_futex_time64)
+#define SYS_futex SYS_futex_time64
+#endif
+
// Some Android NDKs (Google NDK and older Crystax.NET NDK versions) don't define SYS_futex
#if defined(SYS_futex)
#define BOOST_LOG_SYS_FUTEX SYS_futex
--
2.28.0
@@ -7,4 +7,5 @@ SRC_URI += "file://arm-intrinsics.patch \
file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
file://0001-dont-setup-compiler-flags-m32-m64.patch \
file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \
"