[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5192/8267] feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX for armv8

[Emmanuele Bassi <ebassi src gnome org>]

commit c13eb4ff7caff24387c28c38963190c9c3dd9b62
Author: Andre McCurdy <armccurdy gmail com>
Date:   Fri Mar 10 17:31:19 2017 -0800

    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>

 .../conf/machine/include/arm/feature-arm-thumb.inc |   17 +++++++----------
 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 6d4747b..0b47cca 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