diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-05 17:22:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-05 17:22:19 +0100 |
| commit | 4b5e8074f8aca59b09421db464ce652e84f898f2 (patch) | |
| tree | 2baf9e53b08bab7604f0368ceaf20776bf311d55 /meta/conf/machine | |
| parent | a9dc7873415a21f28270d7f81db3e3c39a09b8f6 (diff) | |
| download | openembedded-core-contrib-4b5e8074f8aca59b09421db464ce652e84f898f2.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
| -rw-r--r-- | meta/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 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 |