From 41d50f9b1fd34611b9687927d4ff97bce73ed9e7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 1 Feb 2016 05:08:29 +0000 Subject: boost: Fix build on soft-float ABI arm systems We get errors like ./boost/test/execution_monitor.hpp:490:27: error: 'FE_DIVBYZERO' was not declared in this scope BOOST_FPE_DIVBYZERO = FE_DIVBYZERO, on musl, rightly because FPU is not used on soft-float systems (From OE-Core rev: 17566da0b86cc282d5e598af54e73555c121beb3) Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../recipes-support/boost/boost/consider-hardfp.patch | 19 +++++++++++++++++++ meta/recipes-support/boost/boost_1.60.0.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-support/boost/boost/consider-hardfp.patch diff --git a/meta/recipes-support/boost/boost/consider-hardfp.patch b/meta/recipes-support/boost/boost/consider-hardfp.patch new file mode 100644 index 0000000000..66808a69dd --- /dev/null +++ b/meta/recipes-support/boost/boost/consider-hardfp.patch @@ -0,0 +1,19 @@ +When using soft-float, on ARM we should not expect the FE_* symbols + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +Index: boost_1_60_0/boost/test/execution_monitor.hpp +=================================================================== +--- boost_1_60_0.orig/boost/test/execution_monitor.hpp ++++ boost_1_60_0/boost/test/execution_monitor.hpp +@@ -484,7 +484,8 @@ enum masks { + BOOST_FPE_UNDERFLOW = EM_UNDERFLOW|EM_DENORMAL, + + BOOST_FPE_ALL = MCW_EM, +-#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) ++#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) \ ++ || defined(__ARM_PCS) + BOOST_FPE_ALL = 1, + #else + BOOST_FPE_DIVBYZERO = FE_DIVBYZERO, diff --git a/meta/recipes-support/boost/boost_1.60.0.bb b/meta/recipes-support/boost/boost_1.60.0.bb index e7b91dcc72..4d824c85b5 100644 --- a/meta/recipes-support/boost/boost_1.60.0.bb +++ b/meta/recipes-support/boost/boost_1.60.0.bb @@ -4,4 +4,5 @@ include boost.inc SRC_URI += "\ file://arm-intrinsics.patch \ file://0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch;striplevel=2 \ + file://consider-hardfp.patch \ " -- cgit v1.2.3-54-g00ecf