[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 46/246] arch-mips.inc: Disable QEMU usermode usage when building with n32 ABI

[Emmanuele Bassi <ebassi src gnome org>]

commit a220c3a1a9acfe875f43bfb8c91016777f3303d3
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Thu Sep 1 20:50:54 2016 +0300

    arch-mips.inc: Disable QEMU usermode usage when building with n32 ABI
    
    QEMU usermode doesn't support n32 binaries, erroring with "Invalid
    ELF image for this architecture".
    
    (From OE-Core rev: 66aa39a959bd41f7063fe64a9225eb9fd6c3293b)
    
    (From OE-Core rev: 013dfa3e9f14f50a3d1efb5e98a45ce1e579abcf)
    
    Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/machine/include/mips/arch-mips.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
index 89d17e7..d3e83d1 100644
--- a/meta/conf/machine/include/mips/arch-mips.inc
+++ b/meta/conf/machine/include/mips/arch-mips.inc
@@ -20,6 +20,9 @@ TUNECONFLICTS[n32] = "o32 n64"
 ABIEXTENSION .= "${@bb.utils.contains('TUNE_FEATURES', 'n32', 'n32', '' ,d)}"
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'n32', ' -mabi=n32', '', d)}"
 
+# user mode qemu doesn't support mips64 n32: "Invalid ELF image for this architecture"
+MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'n32', 
'qemu-usermode', '', d)}"
+
 TUNEVALID[n64] = "MIPS64 n64 ABI"
 TUNECONFLICTS[n64] = "o32 n32"
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'n64', ' -mabi=64', '', d)}"