[oe-commits] Martin Jansa : feature-arm-thumb: respect ARM_INSTRUCTION_SET

[git version control]

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

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Sat Jul 30 01:04:33 2011 +0000

feature-arm-thumb: respect ARM_INSTRUCTION_SET

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 .../conf/machine/include/arm/feature-arm-thumb.inc |    3 ++-
 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 b580168..e7d392e 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