From: Saul Wold Date: Tue, 26 Sep 2017 00:52:16 +0000 (-0700) Subject: arch-x86: Add x86-x32 to MACHINEOVERRIDES X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe31dcd2a1d0aa649d1d16b60f9c74ae835e63ce;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git arch-x86: Add x86-x32 to MACHINEOVERRIDES This is needed as an x32 more generic x32 override later in the OVERRIDES, currently linux-gnux32 is the first override, but we need a stronger (later in the list) x32 override to deal with some needed x32 dependency overrides. (From OE-Core rev: 364b3698b78e9fea59d24e3a3a5f4476be95f6d1) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/meta/conf/machine/include/x86/arch-x86.inc index e51d595f747..70814b8d4d3 100644 --- a/meta/conf/machine/include/x86/arch-x86.inc +++ b/meta/conf/machine/include/x86/arch-x86.inc @@ -26,6 +26,7 @@ TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" # user mode qemu doesn't support x32 MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '' ,d)}" # ELF64 ABI TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"