summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-08-12 11:10:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-17 10:35:42 +0100
commitcae5c7444bfacb2baadb0d11961d861058cd4ac0 (patch)
tree15f1c4e98f817b32be32ab206cd3bbadfedfbd2f
parenta56f14e5fcc3e7db1746be862533a7fe337c8c15 (diff)
downloadpoky-cae5c7444bfacb2baadb0d11961d861058cd4ac0.tar.gz
gmp: Fix wrong detection of -march flag
Configure detects -march flag based upon target triplet, it wrongly passes -march=armv4 for all arm, this is unearthed when compiling with clang since it errors out with flags like /tmp/kraj01/a-0c2038.s:27: Error: selected processor does not support `bx r0' in ARM mode since it does not pass --fix-v4bx along with -march=armv4, which does not happen with gcc toolchain since this flag is passed impicitly hence this error was indetected Fixed thusly (From OE-Core rev: 51caeccfc5b18b59deac5005e0059a414cbbed32) 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/gmp/gmp-6.1.1/0001-confiure.ac-Believe-the-cflags-from-environment.patch52
-rw-r--r--meta/recipes-support/gmp/gmp_6.1.1.bb1
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-support/gmp/gmp-6.1.1/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp-6.1.1/0001-confiure.ac-Believe-the-cflags-from-environment.patch
new file mode 100644
index 0000000000..665367658b
--- /dev/null
+++ b/meta/recipes-support/gmp/gmp-6.1.1/0001-confiure.ac-Believe-the-cflags-from-environment.patch
@@ -0,0 +1,52 @@
1From ae1a4c37417a3bbbf8ea1cab198982b0cad47e29 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 12 Aug 2016 17:08:13 +0000
4Subject: [PATCH] confiure.ac: Believe the cflags from environment
5
6In some toolchains e.g. OpenEmbedded -march options
7are passed on compiler cmdline, it does not use
8the expected target triplets to make these decision
9during configure.
10
11Secondly, dont set armv4 for march when no selection
12is made, since it is passed from cmdline
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16Upstream-Status: Inappropriate[OE-Specific]
17
18 configure.ac | 11 -----------
19 1 file changed, 11 deletions(-)
20
21diff --git a/configure.ac b/configure.ac
22index 857ea3b..359e919 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -607,15 +607,6 @@ case $host in
26 GMP_INCLUDE_MPN(arm/arm-defs.m4)
27 CALLING_CONVENTIONS_OBJS='arm32call.lo arm32check.lo'
28
29- # This is needed for clang, which is not content with flags like -mfpu=neon
30- # alone.
31- case $host in
32- *-*-*eabi)
33- gcc_cflags_fpmode="-mfloat-abi=softfp" ;;
34- *-*-*eabihf)
35- gcc_cflags_fpmode="-mfloat-abi=hard" ;;
36- esac
37-
38 # FIXME: We make mandatory compiler options optional here. We should
39 # either enforce them, or organise to strip paths as the corresponding
40 # options fail.
41@@ -686,8 +677,6 @@ case $host in
42 ;;
43 *)
44 path="arm"
45- gcc_cflags_arch="-march=armv4"
46- GMP_DEFINE_RAW(["define(<NOTHUMB>,1)"])
47 ;;
48 esac
49 ;;
50--
511.9.1
52
diff --git a/meta/recipes-support/gmp/gmp_6.1.1.bb b/meta/recipes-support/gmp/gmp_6.1.1.bb
index 1df9b06cc8..303c3ef9e2 100644
--- a/meta/recipes-support/gmp/gmp_6.1.1.bb
+++ b/meta/recipes-support/gmp/gmp_6.1.1.bb
@@ -12,6 +12,7 @@ SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \
12 file://amd64.patch \ 12 file://amd64.patch \
13 file://use-includedir.patch \ 13 file://use-includedir.patch \
14 file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ 14 file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \
15 file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \
15 " 16 "
16 17
17SRC_URI[md5sum] = "4c175f86e11eb32d8bf9872ca3a8e11d" 18SRC_URI[md5sum] = "4c175f86e11eb32d8bf9872ca3a8e11d"