From 2bba10be28d4d7ce45d78a8429caaa6952785901 Mon Sep 17 00:00:00 2001 From: hongxu Date: Tue, 31 Mar 2020 15:16:55 +0800 Subject: libvirt: Workaround mips assembler crash on target While enabling multilib on qemumips64, lib32 assembler ends up crashing on target sometimes due to branch out of range, therefore using -O2 for now [snip] |../../libvirt-6.1.0/tests/qemuxml2argvtest.c: In function 'mymain': |../../libvirt-6.1.0/tests/qemuxml2argvtest.c:608:1: note: variable tracking size limit exceeded with '-fvar-tracking-assignments', retrying without | 608 | mymain(void) | | ^~~~~~ |/tmp/ccXJSwZR.s: Assembler messages: |/tmp/ccXJSwZR.s:43943: Error: branch out of range [snip] Signed-off-by: Hongxu Jia Signed-off-by: Bruce Ashfield --- recipes-extended/libvirt/libvirt_6.1.0.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'recipes-extended') diff --git a/recipes-extended/libvirt/libvirt_6.1.0.bb b/recipes-extended/libvirt/libvirt_6.1.0.bb index 15f33aad..7b109204 100644 --- a/recipes-extended/libvirt/libvirt_6.1.0.bb +++ b/recipes-extended/libvirt/libvirt_6.1.0.bb @@ -375,6 +375,11 @@ EXTRA_OECONF += " \ --with-test-suite \ " +# gcc9 end up mis-compiling qemuxml2argvtest.o with Og which then +# crashes on target, so remove -Og and use -O2 as workaround +SELECTED_OPTIMIZATION_remove_virtclass-multilib-lib32_mipsarch = "-Og" +SELECTED_OPTIMIZATION_append_virtclass-multilib-lib32_mipsarch = " -O2" + EXTRA_OEMAKE = "BUILD_DIR=${B} DEST_DIR=${D}${PTEST_PATH} PTEST_DIR=${PTEST_PATH} SYSTEMD_UNIT_DIR=${systemd_system_unitdir}" PRIVATE_LIBS_${PN}-ptest_append = "libvirt-admin.so.0" -- cgit v1.2.3-54-g00ecf