[oe-commits] Richard Purdie : machine/include/arm/feature-arm-thumb: Allow thumb to be disabled

[git version control]

Module: openembedded-core.git
Branch: master
Commit: 4b5e8074f8aca59b09421db464ce652e84f898f2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4b5e8074f8aca59b09421db464ce652e84f898f2

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Aug  5 17:22:16 2011 +0100

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.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../conf/machine/include/arm/feature-arm-thumb.inc |    2 +-
 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 e7d392e..d606a35 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 @@
 # slower.
 TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
 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)}"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "", d)}"
 OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
 
 # Note armv7 will hit on armv7a as well