diff options
Diffstat (limited to 'meta/conf/machine/include/arm/feature-arm-thumb.inc')
-rw-r--r-- | meta/conf/machine/include/arm/feature-arm-thumb.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc index a94386f577..8e6619d1b5 100644 --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc | |||
@@ -18,6 +18,8 @@ ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 't2', '', d | |||
18 | # some recipe explicitly sets ARM_INSTRUCTION_SET to "arm" | 18 | # some recipe explicitly sets ARM_INSTRUCTION_SET to "arm" |
19 | ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 'thumb', d)}" | 19 | ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 'thumb', d)}" |
20 | python () { | 20 | python () { |
21 | if bb.utils.contains('TUNE_FEATURES', 'thumb', 'False', 'True', d): | ||
22 | return | ||
21 | selected = d.getVar('ARM_INSTRUCTION_SET', True) | 23 | selected = d.getVar('ARM_INSTRUCTION_SET', True) |
22 | if selected == None: | 24 | if selected == None: |
23 | return | 25 | return |
@@ -37,8 +39,10 @@ ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_ | |||
37 | # arm system and vice versa. It is strongly recommended that DISTROs not | 39 | # arm system and vice versa. It is strongly recommended that DISTROs not |
38 | # turn this off - the actual cost is very small. | 40 | # turn this off - the actual cost is very small. |
39 | TUNEVALID[no-thumb-interwork] = "Disable mixing of thumb and ARM functions" | 41 | TUNEVALID[no-thumb-interwork] = "Disable mixing of thumb and ARM functions" |
40 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', ' -mno-thumb-interwork', ' -mthumb-interwork', d)}" | 42 | THUMB_TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', ' -mno-thumb-interwork', ' -mthumb-interwork', d)}" |
41 | OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', ':thumb-interwork', '', d)}" | 43 | THUMB_OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', ':thumb-interwork', '', d)}" |
44 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' ${THUMB_TUNE_CCARGS}', '', d)}" | ||
45 | OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' ${THUMB_OVERRIDES}', '', d)}" | ||
42 | 46 | ||
43 | # what about armv7m devices which don't support -marm (e.g. Cortex-M3)? | 47 | # what about armv7m devices which don't support -marm (e.g. Cortex-M3)? |
44 | TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -marm" | 48 | TARGET_CC_KERNEL_ARCH += "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '-mno-thumb-interwork -marm', '', d)}" |