summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-02-01 05:08:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-02 14:44:16 +0000
commit41d50f9b1fd34611b9687927d4ff97bce73ed9e7 (patch)
tree794b19325210b248d8ba947a41956427f6f077e0
parent07a91a6e31b777c97704e1b031bda2665bb8bc2d (diff)
downloadpoky-41d50f9b1fd34611b9687927d4ff97bce73ed9e7.tar.gz
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 <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost/consider-hardfp.patch19
-rw-r--r--meta/recipes-support/boost/boost_1.60.0.bb1
2 files changed, 20 insertions, 0 deletions
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 @@
1When using soft-float, on ARM we should not expect the FE_* symbols
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending
5
6Index: boost_1_60_0/boost/test/execution_monitor.hpp
7===================================================================
8--- boost_1_60_0.orig/boost/test/execution_monitor.hpp
9+++ boost_1_60_0/boost/test/execution_monitor.hpp
10@@ -484,7 +484,8 @@ enum masks {
11 BOOST_FPE_UNDERFLOW = EM_UNDERFLOW|EM_DENORMAL,
12
13 BOOST_FPE_ALL = MCW_EM,
14-#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG)
15+#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) \
16+ || defined(__ARM_PCS)
17 BOOST_FPE_ALL = 1,
18 #else
19 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
4SRC_URI += "\ 4SRC_URI += "\
5 file://arm-intrinsics.patch \ 5 file://arm-intrinsics.patch \
6 file://0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch;striplevel=2 \ 6 file://0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch;striplevel=2 \
7 file://consider-hardfp.patch \
7" 8"