summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-03-10 17:31:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 11:35:19 +0000
commitc13eb4ff7caff24387c28c38963190c9c3dd9b62 (patch)
tree56d55c47fe17d8d293a30661a91f7ade5dfb5932 /meta/conf/machine
parentb64105296169dc3705e9bcea389c06328ce68505 (diff)
downloadpoky-c13eb4ff7caff24387c28c38963190c9c3dd9b62.tar.gz
feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX for armv8
The current definition for ARM_THUMB_SUFFIX doesn't consider armv8 and will therefore cause TUNE_PKGARCH to be set incorrectly for machines which inherit arch-armv8 and don't include aarch64 in TUNE_FEATURES (ie when building for 32bit ARMv8). Also fix typo in comments and improve TUNEVALID[thumb] wording. (From OE-Core rev: 3691fd7dbe7f01ca29c14fc603c6946864af3b3c) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> 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.inc17
1 files changed, 7 insertions, 10 deletions
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index 6d4747b21a..0b47ccad02 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -1,17 +1,14 @@
1TUNEVALID[thumb] = "Use thumb instructions instead of ARM" 1
2ARM_THUMB_OPT = "${@['arm', 'thumb'][d.getVar('ARM_INSTRUCTION_SET') == 'thumb']}" 2TUNEVALID[thumb] = "Support Thumb instructions"
3ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', 't', '', d)}" 3
4ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv5', 't', '', d)}" 4ARM_THUMB_SUFFIX = "${@bb.utils.contains_any('TUNE_FEATURES', 'armv4 armv5 armv6', 't', 't2', d)}"
5ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv6', 't', '', d)}"
6ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 't2', '', d)}"
7ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7r', 't2', '', d)}"
8ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 't2', '', d)}"
9ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7ve', 't2', '', d)}"
10 5
11# If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm" or "thumb") 6# If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm" or "thumb")
12# If the defice doesn't support ARM, then always set "thumb" even when 7# If the device doesn't support ARM, then always set "thumb" even when
13# some recipe explicitly sets ARM_INSTRUCTION_SET to "arm" 8# some recipe explicitly sets ARM_INSTRUCTION_SET to "arm"
9ARM_THUMB_OPT = "${@['arm', 'thumb'][d.getVar('ARM_INSTRUCTION_SET') == 'thumb']}"
14ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 'thumb', d)}" 10ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 'thumb', d)}"
11
15python () { 12python () {
16 if bb.utils.contains('TUNE_FEATURES', 'thumb', False, True, d): 13 if bb.utils.contains('TUNE_FEATURES', 'thumb', False, True, d):
17 return 14 return