summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-07-30 01:04:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-01 14:16:55 +0100
commit8685aa52d1a0b58a487e466c4d57dd663398e169 (patch)
treeb0e4dbb8e09f8c9e39961eb81237db92871f5cbe
parentf1d3a94e81c82ede96c90e31b7f9cb229657b779 (diff)
downloadpoky-8685aa52d1a0b58a487e466c4d57dd663398e169.tar.gz
poky-8685aa52d1a0b58a487e466c4d57dd663398e169.tar.bz2
poky-8685aa52d1a0b58a487e466c4d57dd663398e169.zip
feature-arm-thumb: respect ARM_INSTRUCTION_SET
(From OE-Core rev: e23f9ce928353c9da2b9c4bfa9a1a125a7d160f2) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/arm/feature-arm-thumb.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index b5801687fa..e7d392e95a 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -5,7 +5,8 @@
# but requires more instructions (140% for 70% smaller code) so may be
# slower.
TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "-mthumb", "-mno-thumb", d)}"
+ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
# Note armv7 will hit on armv7a as well