summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/arm/feature-arm-thumb.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index 0b47ccad02..bae169da3a 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -1,8 +1,6 @@
1 1
2TUNEVALID[thumb] = "Support Thumb instructions" 2TUNEVALID[thumb] = "Support Thumb instructions"
3 3
4ARM_THUMB_SUFFIX = "${@bb.utils.contains_any('TUNE_FEATURES', 'armv4 armv5 armv6', 't', 't2', d)}"
5
6# If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm" or "thumb") 4# If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm" or "thumb")
7# If the device doesn't support ARM, then always set "thumb" even when 5# If the device doesn't support ARM, then always set "thumb" even when
8# some recipe explicitly sets ARM_INSTRUCTION_SET to "arm" 6# some recipe explicitly sets ARM_INSTRUCTION_SET to "arm"
@@ -23,6 +21,11 @@ python () {
23 21
24TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}" 22TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}"
25 23
24ARM_THUMB_SUFFIX = "t2"
25ARM_THUMB_SUFFIX_armv4 = "t"
26ARM_THUMB_SUFFIX_armv5 = "t"
27ARM_THUMB_SUFFIX_armv6 = "t"
28
26# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb 29# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb
27ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}" 30ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}"
28 31