summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-05 17:22:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-05 17:25:15 +0100
commit34bdd8b33bfcc1672c872dfc142fdce1d8b61047 (patch)
treeea1ea6eda115176661e335356f39040639204eb6 /meta
parent29208d2e353ba2f0b1c9b5d59014a2ea71dde078 (diff)
downloadpoky-34bdd8b33bfcc1672c872dfc142fdce1d8b61047.tar.gz
machine/include/arm/feature-arm-thumb: Allow thumb to be disabled
The previous commit to this file meant thumb was always being turned on even when TUNE_FEATURES did not contain "thumb". This is clearly wrong and this patch corrects this so thumb options are no longer specified in that case. (From OE-Core rev: 4b5e8074f8aca59b09421db464ce652e84f898f2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/include/arm/feature-arm-thumb.inc2
1 files changed, 1 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 e7d392e95a..d606a35ca9 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -6,7 +6,7 @@
6# slower. 6# slower.
7TUNEVALID[thumb] = "Use thumb instructions instead of ARM" 7TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
8ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" 8ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
9TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}" 9TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "", d)}"
10OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}" 10OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
11 11
12# Note armv7 will hit on armv7a as well 12# Note armv7 will hit on armv7a as well