Drop DEBUG_BUILD, due to qemu doesn't work without optimization [1], disable
it with -O2 even though debug build is enabled (fragment core/yocto/debug-build)

[1] https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html

Signed-off-by: Hongxu Jia <[email protected]>
---
 meta/conf/distro/include/debug_build.inc | 10 ++++++++++
 meta/recipes-devtools/qemu/qemu.inc      |  4 ----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/conf/distro/include/debug_build.inc 
b/meta/conf/distro/include/debug_build.inc
index 28f6ac6f6b..aadc87e5f5 100644
--- a/meta/conf/distro/include/debug_build.inc
+++ b/meta/conf/distro/include/debug_build.inc
@@ -21,6 +21,11 @@ DEBUG_OPTIMIZATION:mips:pn-python3-lxml = "-O 
${DEBUG_LEVELFLAG}"
 DEBUG_OPTIMIZATION:mipsel:pn-python3-lxml = "-O ${DEBUG_LEVELFLAG}"
 # used to fix 
../../../../../../../../../work-shared/gcc-8.3.0-r0/gcc-8.3.0/libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21:
 error: 'st.st_mode' may be used uninitialized in this function 
[-Werror=maybe-uninitialized]
 DEBUG_OPTIMIZATION:append:pn-gcc-sanitizers = " -Wno-error"
+# Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html
+# upstream states qemu doesn't work without optimization
+DEBUG_OPTIMIZATION:pn-qemu = "-O2 ${DEBUG_LEVELFLAG}"
+DEBUG_OPTIMIZATION:pn-qemu-native = "-O2 ${DEBUG_LEVELFLAG}"
+DEBUG_OPTIMIZATION:pn-nativesdk-qemu = "-O2 ${DEBUG_LEVELFLAG}"
 
 BUILD_OPTIMIZATION:mips:pn-kea = "-O -g"
 BUILD_OPTIMIZATION:mipsel:pn-kea = "-O -g"
@@ -28,6 +33,11 @@ BUILD_OPTIMIZATION:mipsel:pn-kea = "-O -g"
 # {standard input}:1488805: Error: branch out of range
 BUILD_OPTIMIZATION:mips:pn-python3-lxml = "-O -g"
 BUILD_OPTIMIZATION:mipsel:pn-python3-lxml = "-O -g"
+# Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html
+# upstream states qemu doesn't work without optimization
+BUILD_OPTIMIZATION:pn-qemu = "-O2"
+BUILD_OPTIMIZATION:pn-qemu-native = "-O2"
+BUILD_OPTIMIZATION:pn-nativesdk-qemu = "-O2"
 
 CPPFLAGS:append:arm:pn-lttng-ust = " -DUATOMIC_NO_LINK_ERROR"
 
diff --git a/meta/recipes-devtools/qemu/qemu.inc 
b/meta/recipes-devtools/qemu/qemu.inc
index 63414196fa..12312e5800 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -59,10 +59,6 @@ COMPATIBLE_HOST:mipsarchn32 = "null"
 COMPATIBLE_HOST:mipsarchn64 = "null"
 COMPATIBLE_HOST:riscv32 = "null"
 
-# Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html
-# upstream states qemu doesn't work without optimization
-DEBUG_BUILD = "0"
-
 do_install:append() {
     # Prevent QA warnings about installed ${localstatedir}/run
     if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#228059): 
https://lists.openembedded.org/g/openembedded-core/message/228059
Mute This Topic: https://lists.openembedded.org/mt/116827535/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to