From 805dd4807d322dc70cef97edd68fdb3142b60fb1 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 23 Aug 2019 13:51:36 -0700 Subject: feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX Since TUNE_FEATURES now either contains a CPU or an architecture (but not both) we can't rely on finding the architecture in TUNE_FEATURES. Use architecture specific over-rides instead. Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- meta/conf/machine/include/arm/feature-arm-thumb.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/conf') 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 @@ 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 device doesn't support ARM, then always set "thumb" even when # some recipe explicitly sets ARM_INSTRUCTION_SET to "arm" @@ -23,6 +21,11 @@ python () { TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}" +ARM_THUMB_SUFFIX = "t2" +ARM_THUMB_SUFFIX_armv4 = "t" +ARM_THUMB_SUFFIX_armv5 = "t" +ARM_THUMB_SUFFIX_armv6 = "t" + # Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}" -- cgit 1.2.3-korg