summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-12-26 11:52:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 15:19:52 (GMT)
commit4257e91cc5b41369114b0d73f460aa21d45cf59f (patch)
tree2fcc132be5aeb1a62f0be4dad2b20304204c1189
parentbf471a1aa905fb9b8bfa2d8d57fc56b119483693 (diff)
downloadpoky-4257e91cc5b41369114b0d73f460aa21d45cf59f.tar.gz
arch-armv4.inc: add --fix-v4bx to TARGET_LD_KERNEL_ARCH only for armv4 and strongarm1100
* without this patch it does apply --fix-v4bx not only to armv4, but also all higher (because they also have armv4 in TUNE_FEATURES) * it causes SIGILL on armv4t http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-November/042298.html * someone please test on armv4 device (I tested only bitbake -e output that it's correctly applied with DEFAULTTUNE == armv4 * maybe we can should fix this in binutils instead (both 2.22 and 2.23 are affected) (From OE-Core rev: 1691ff86c8aefd3c193ae9a2cdd998c7dc6d3270) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/arm/arch-armv4.inc8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc
index cb747ac..075366a 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/meta/conf/machine/include/arm/arch-armv4.inc
@@ -4,7 +4,13 @@ ARMPKGARCH ?= "armv4"
4 4
5TUNEVALID[armv4] = "Enable instructions for ARMv4" 5TUNEVALID[armv4] = "Enable instructions for ARMv4"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "-march=armv4${ARMPKGSFX_THUMB}", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "-march=armv4${ARMPKGSFX_THUMB}", "", d)}"
7TARGET_LD_KERNEL_ARCH += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "--fix-v4bx", "", d)}" 7# enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb
8# maybe we should extend bb.utils.contains to support check for any checkvalues in value, now it does
9# checkvalues.issubset(val) which cannot be used for negative test of foo neither bar in value
10FIX_V4BX_ARMV4 = "${@bb.utils.contains("TUNE_FEATURES", "armv4", "--fix-v4bx", "", d)}"
11FIX_V4BX_ARMV5 = "${@bb.utils.contains("TUNE_FEATURES", "armv5", "", "${FIX_V4BX_ARMV4}", d)}"
12FIX_V4BX = "${@bb.utils.contains("TUNE_FEATURES", "thumb", "", "${FIX_V4BX_ARMV5}", d)}"
13TARGET_LD_KERNEL_ARCH += "${FIX_V4BX}"
8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}" 14MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}"
9 15
10require conf/machine/include/arm/arch-arm.inc 16require conf/machine/include/arm/arch-arm.inc