summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-06-20 10:35:54 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-21 00:26:09 +0100
commitd741ebf346f265e331722369c8260a0a7af9e8e2 (patch)
tree99a1dac5f6784b65c04781a3c340c3697eef481f
parent71ae975c49881174c2cb2a07c66e8468a27e7ac1 (diff)
downloadopenembedded-core-contrib-d741ebf346f265e331722369c8260a0a7af9e8e2.tar.gz
openembedded-core-contrib-d741ebf346f265e331722369c8260a0a7af9e8e2.tar.bz2
openembedded-core-contrib-d741ebf346f265e331722369c8260a0a7af9e8e2.zip
qemu: disable capstone for 32-bit mips with multilib
When build lib32-qemu for qemumips with multilib: require conf/multilib.conf MACHINE = "qemumips64" MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "mips" it fails to compile capstone: | CC arch/AArch64/AArch64InstPrinter.o | {standard input}: Assembler messages: | {standard input}:36033: Error: branch out of range | {standard input}:36257: Error: branch out of range Disable capstone for mips o32 in this situation as a workround. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu_4.0.0.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu_4.0.0.bb b/meta/recipes-devtools/qemu/qemu_4.0.0.bb
index f119215b21..76776098d0 100644
--- a/meta/recipes-devtools/qemu/qemu_4.0.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_4.0.0.bb
@@ -7,6 +7,7 @@ DEPENDS = "glib-2.0 zlib pixman bison-native"
RDEPENDS_${PN}_class-target += "bash"
EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}"
+EXTRA_OECONF_append_class-target_mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
do_install_append_class-nativesdk() {