From 8685aa52d1a0b58a487e466c4d57dd663398e169 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 30 Jul 2011 01:04:33 +0000 Subject: feature-arm-thumb: respect ARM_INSTRUCTION_SET (From OE-Core rev: e23f9ce928353c9da2b9c4bfa9a1a125a7d160f2) Signed-off-by: Martin Jansa Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf