From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Date: Wed, 8 Sep 2021 08:56:46 +0000 (+0200)
Subject: conf/mips: mips16e: prepend override to MACHINEOVERRIDES
X-Git-Tag: yocto-3.4~153
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c1d524cae8ba5aa1e30e4a66937b8af3d4a67531;p=openembedded-core.git

conf/mips: mips16e: prepend override to MACHINEOVERRIDES

Add the tune specific override to MACHINEOVERRIDES and not OVERRIDES as
is done for all other tune include files.

Also prepend it instead of appending so that it's among the leftmost
overrides in MACHINEOVERRIDES and has a lower precedence compared to
other MACHINEOVERRIDES added later (which usually are added via a =.
(prepend)).

Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/machine/include/mips/feature-mips-mips16e.inc b/meta/conf/machine/include/mips/feature-mips-mips16e.inc
index 101d5331bc..6fd12fb842 100644
--- a/meta/conf/machine/include/mips/feature-mips-mips16e.inc
+++ b/meta/conf/machine/include/mips/feature-mips-mips16e.inc
@@ -11,7 +11,7 @@ MIPSPKGSFX_MIPS16E .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', '-m16',
 TUNEVALID[no-interlink-compressed] = "Disable mixing of standard and MIPS16e code"
 MIPS16_TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-interlink-compressed', ' -mno-interlink-compressed', ' -minterlink-compressed', d)}"
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ' ${MIPS16_TUNE_CCARGS}', '', d)}"
-OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ':mips16e', '', d)}"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', 'mips16e:', '', d)}"
 
 # show status (if compiling in MIPS16e mode)
 BUILDCFG_VARS += "${@['', 'MIPS_INSTRUCTION_SET'][d.getVar('MIPS_INSTRUCTION_SET') == 'mips16e']}"