From 34bdd8b33bfcc1672c872dfc142fdce1d8b61047 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 5 Aug 2011 17:22:16 +0100 Subject: 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 --- meta/conf/machine/include/arm/feature-arm-thumb.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/conf/machine') 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 @@ # 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 -- cgit v1.2.3-54-g00ecf