aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-09-01 20:50:54 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 15:26:12 +0100
commit013dfa3e9f14f50a3d1efb5e98a45ce1e579abcf (patch)
tree59cc4e5b01ee78ca5f8683ba0dca7470d3581aea
parent4dbe39ee56ff888190b1a110496bc0fb6c400d9a (diff)
downloadopenembedded-core-contrib-013dfa3e9f14f50a3d1efb5e98a45ce1e579abcf.tar.gz
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) 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>
-rw-r--r--meta/conf/machine/include/mips/arch-mips.inc3
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 89d17e7c20..d3e83d17f6 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)}"