summaryrefslogtreecommitdiff
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-21 22:42:59 +0000
commit3691fd7dbe7f01ca29c14fc603c6946864af3b3c (patch)
tree4c9cd6b04eec15e3010c115a3468e4a4ac4e141e
parent0fa3d331df7d5a5fbd8431febc75efe6bcc6f96b (diff)
downloadopenembedded-core-3691fd7dbe7f01ca29c14fc603c6946864af3b3c.tar.gz
openembedded-core-3691fd7dbe7f01ca29c14fc603c6946864af3b3c.tar.bz2
openembedded-core-3691fd7dbe7f01ca29c14fc603c6946864af3b3c.zip
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. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 @@
-TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
-ARM_THUMB_OPT = "${@['arm', 'thumb'][d.getVar('ARM_INSTRUCTION_SET') == 'thumb']}"
-ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', 't', '', d)}"
-ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv5', 't', '', d)}"
-ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv6', 't', '', d)}"
-ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 't2', '', d)}"
-ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7r', 't2', '', d)}"
-ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 't2', '', d)}"
-ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7ve', 't2', '', d)}"
+
+TUNEVALID[thumb] = "Support Thumb instructions"
+
+ARM_THUMB_SUFFIX = "${@bb.utils.contains_any('TUNE_FEATURES', 'armv4 armv5 armv6', 't', 't2', d)}"
# If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm" or "thumb")
-# If the defice doesn't support ARM, then always set "thumb" even when
+# If the device doesn't support ARM, then always set "thumb" even when
# some recipe explicitly sets ARM_INSTRUCTION_SET to "arm"
+ARM_THUMB_OPT = "${@['arm', 'thumb'][d.getVar('ARM_INSTRUCTION_SET') == 'thumb']}"
ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 'thumb', d)}"
+
python () {
if bb.utils.contains('TUNE_FEATURES', 'thumb', False, True, d):
return