summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-11-23 08:14:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 14:47:58 +0000
commit627ef2bfc9171ec969623a4d8e2bbe57bea4f2d6 (patch)
tree9fe1737d8b52bc47fe7b27baa5780dd6176b2487 /meta/conf/machine
parentd8bb18e2cec9f856c02d5ae4c4a8f2edd5fad8bf (diff)
downloadpoky-627ef2bfc9171ec969623a4d8e2bbe57bea4f2d6.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: efe03fc00fc051bede69ced6643a8f25d02eabde) 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>
Diffstat (limited to 'meta/conf/machine')
-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 bfa2377c60..fcd56d72d9 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/meta/conf/machine/include/arm/arch-armv4.inc
@@ -2,7 +2,13 @@ DEFAULTTUNE ?= "armv4"
2 2
3TUNEVALID[armv4] = "Enable instructions for ARMv4" 3TUNEVALID[armv4] = "Enable instructions for ARMv4"
4TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "-march=armv4${ARMPKGSFX_THUMB}", "", d)}" 4TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "-march=armv4${ARMPKGSFX_THUMB}", "", d)}"
5TARGET_LD_KERNEL_ARCH += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "--fix-v4bx", "", d)}" 5# enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb
6# maybe we should extend bb.utils.contains to support check for any checkvalues in value, now it does
7# checkvalues.issubset(val) which cannot be used for negative test of foo neither bar in value
8FIX_V4BX_ARMV4 = "${@bb.utils.contains("TUNE_FEATURES", "armv4", "--fix-v4bx", "", d)}"
9FIX_V4BX_ARMV5 = "${@bb.utils.contains("TUNE_FEATURES", "armv5", "", "${FIX_V4BX_ARMV4}", d)}"
10FIX_V4BX = "${@bb.utils.contains("TUNE_FEATURES", "thumb", "", "${FIX_V4BX_ARMV5}", d)}"
11TARGET_LD_KERNEL_ARCH += "${FIX_V4BX}"
6MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}" 12MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}"
7 13
8require conf/machine/include/arm/arch-arm.inc 14require conf/machine/include/arm/arch-arm.inc