Skip to content

Commit f35432a

Browse files
committed
Revert "meson.build: default to -gsplit-dwarf for debug info"
This reverts commit 563b1a3. Split debug info support is broken when cross compiling (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99973). People that would like to use it can add it via --extra-cflags. Reported-by: Konstantin Kostiuk <[email protected]> Reviewed-by: Daniel P. Berrangé <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent d185911 commit f35432a

File tree

3 files changed

+0
-10
lines changed

3 files changed

+0
-10
lines changed

meson.build

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,6 @@ if get_option('tsan')
604604
qemu_ldflags = ['-fsanitize=thread'] + qemu_ldflags
605605
endif
606606

607-
if get_option('debug') and get_option('split_debug')
608-
qemu_cflags += '-gsplit-dwarf'
609-
endif
610-
611607
# Detect support for PT_GNU_RELRO + DT_BIND_NOW.
612608
# The combination is known as "full relro", because .got.plt is read-only too.
613609
qemu_ldflags += cc.get_supported_link_arguments('-Wl,-z,relro', '-Wl,-z,now')
@@ -4599,8 +4595,6 @@ if have_rust
45994595
summary_info += {'bindgen': bindgen.full_path()}
46004596
summary_info += {'bindgen version': bindgen.version()}
46014597
endif
4602-
# option_cflags is purely for the summary display, meson will pass
4603-
# -g/-O options directly
46044598
option_cflags = (get_option('debug') ? ['-g'] : [])
46054599
if get_option('optimization') != 'plain'
46064600
option_cflags += ['-O' + get_option('optimization')]

meson_options.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,6 @@ option('debug_mutex', type: 'boolean', value: false,
362362
description: 'mutex debugging support')
363363
option('debug_stack_usage', type: 'boolean', value: false,
364364
description: 'measure coroutine stack usage')
365-
option('split_debug', type: 'boolean', value: true,
366-
description: 'split debug info from object files')
367365
option('qom_cast_debug', type: 'boolean', value: true,
368366
description: 'cast debugging support')
369367
option('slirp_smbd', type : 'feature', value : 'auto',

scripts/meson-buildoptions.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,6 @@ _meson_option_parse() {
504504
--disable-strict-rust-lints) printf "%s" -Dstrict_rust_lints=false ;;
505505
--enable-strip) printf "%s" -Dstrip=true ;;
506506
--disable-strip) printf "%s" -Dstrip=false ;;
507-
--enable-split-debug) printf "%s" -Dsplit_debug=true ;;
508-
--disable-split-debug) printf "%s" -Dsplit_debug=false ;;
509507
--sysconfdir=*) quote_sh "-Dsysconfdir=$2" ;;
510508
--enable-tcg) printf "%s" -Dtcg=enabled ;;
511509
--disable-tcg) printf "%s" -Dtcg=disabled ;;

0 commit comments

Comments
 (0)