From: Tom de Vries Date: Fri, 17 Jul 2020 11:06:42 +0000 (+0200) Subject: [gdb/testsuite] Remove Dwarf::extern X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=315e6afc824fcc7689dd8f51cbb2d18e97fb5374;p=binutils-gdb.git [gdb/testsuite] Remove Dwarf::extern The file lib/dwarf.exp contains: ... # Declare a global label. This is typically used to refer to # labels defined in other files, for example a function defined in # a .c file. proc extern {args} { foreach name $args { _op .global $name } } ... The assembler directive to refer to labels defined in other files is not .global, but .extern, and that one is ignored by gas. Since we require gas for all dwarf assembly test-cases, remove the proc and all it's uses. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-07-17 Tom de Vries * lib/dwarf.exp (Dwarf::extern): Remove. * gdb.compile/compile-ops.exp: Remove use of Dwarf::extern. * gdb.dlang/circular.exp: Same. * gdb.dwarf2/comp-unit-lang.exp: Same. * gdb.dwarf2/dw2-ifort-parameter.exp: Same. * gdb.dwarf2/dw2-symtab-includes.exp: Same. * gdb.dwarf2/dwz.exp: Same. * gdb.dwarf2/imported-unit-abstract-const-value.exp: Same. * gdb.dwarf2/imported-unit-runto-main.exp: Same. * gdb.dwarf2/imported-unit.exp: Same. * gdb.dwarf2/opaque-type-lookup.exp: Same. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e20e0266970..76ad9657d45 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,17 @@ +2020-07-17 Tom de Vries + + * lib/dwarf.exp (Dwarf::extern): Remove. + * gdb.compile/compile-ops.exp: Remove use of Dwarf::extern. + * gdb.dlang/circular.exp: Same. + * gdb.dwarf2/comp-unit-lang.exp: Same. + * gdb.dwarf2/dw2-ifort-parameter.exp: Same. + * gdb.dwarf2/dw2-symtab-includes.exp: Same. + * gdb.dwarf2/dwz.exp: Same. + * gdb.dwarf2/imported-unit-abstract-const-value.exp: Same. + * gdb.dwarf2/imported-unit-runto-main.exp: Same. + * gdb.dwarf2/imported-unit.exp: Same. + * gdb.dwarf2/opaque-type-lookup.exp: Same. + 2020-07-16 Sandra Loosemore * gdb.base/shell.exp: Skip pipe tests dependent on sh on Windows host. diff --git a/gdb/testsuite/gdb.compile/compile-ops.exp b/gdb/testsuite/gdb.compile/compile-ops.exp index d9aee413a6e..7c801d932c2 100644 --- a/gdb/testsuite/gdb.compile/compile-ops.exp +++ b/gdb/testsuite/gdb.compile/compile-ops.exp @@ -362,7 +362,6 @@ Dwarf::assemble $asm_file { cu { addr_size 4 } { declare_labels int_label - extern func_start func_end ptr compile_unit { {name file1.txt} diff --git a/gdb/testsuite/gdb.dlang/circular.exp b/gdb/testsuite/gdb.dlang/circular.exp index f3d8f604693..1e04370478a 100644 --- a/gdb/testsuite/gdb.dlang/circular.exp +++ b/gdb/testsuite/gdb.dlang/circular.exp @@ -37,8 +37,6 @@ Dwarf::assemble $asm_file { declare_labels circular1_label circular2_label circular3_label declare_labels circular4_label circular5_label - extern circular1_found_start circular1_found_end - circular1_label: module { {name circular1} } { diff --git a/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp b/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp index 8ff6b733cc9..2ebe6caedc3 100644 --- a/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp +++ b/gdb/testsuite/gdb.dwarf2/comp-unit-lang.exp @@ -42,8 +42,6 @@ proc do_test {cu_lang gdb_lang} { # Creating a CU with 4-byte addresses lets this test link on # both 32- and 64-bit machines. cu { addr_size 4 } { - extern func_start func_end - compile_unit { {name file1.txt} {language @$cu_lang} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp index 75f17c5192e..2388ce53f6e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp @@ -29,7 +29,6 @@ set asm_file [standard_output_file $srcfile2] Dwarf::assemble $asm_file { declare_labels int_label - extern func_start func_end ptr global srcdir subdir srcfile cu {} { diff --git a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp index 1eaaf4af4fa..e10e4130358 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes.exp @@ -31,8 +31,6 @@ Dwarf::assemble $asm_file { declare_labels partial_label lines_label global srcdir subdir srcfile - extern main - cu {} { partial_label: partial_unit {} { } diff --git a/gdb/testsuite/gdb.dwarf2/dwz.exp b/gdb/testsuite/gdb.dwarf2/dwz.exp index b9987ed0d11..9f5eda5e381 100644 --- a/gdb/testsuite/gdb.dwarf2/dwz.exp +++ b/gdb/testsuite/gdb.dwarf2/dwz.exp @@ -28,8 +28,6 @@ Dwarf::assemble $asm_file { declare_labels partial_label int_label int_label2 global srcdir subdir srcfile - extern main - cu {} { partial_label: partial_unit {} { subprogram { diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-abstract-const-value.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-abstract-const-value.exp index f93dc123885..13a7e97cc56 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-abstract-const-value.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-abstract-const-value.exp @@ -42,8 +42,6 @@ Dwarf::assemble $asm_file { global srcdir subdir srcfile - extern main - set main_range [function_range main ${srcdir}/${subdir}/${srcfile}] set main_start [lindex $main_range 0] set main_length [lindex $main_range 1] diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp index 27946840534..8a05ee85270 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp @@ -39,8 +39,6 @@ Dwarf::assemble $asm_file { global srcdir subdir srcfile - extern main - set main_range [function_range main ${srcdir}/${subdir}/${srcfile}] set main_start [lindex $main_range 0] set main_length [lindex $main_range 1] diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit.exp b/gdb/testsuite/gdb.dwarf2/imported-unit.exp index 32a9abf6204..dba87ffcb2c 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit.exp @@ -56,9 +56,6 @@ Dwarf::assemble $asm_file { global srcdir subdir srcfile - extern main - extern doit - set main_range [function_range main ${srcdir}/${subdir}/${srcfile}] set main_start [lindex $main_range 0] set main_length [lindex $main_range 1] diff --git a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp index 60d67b1bda3..19316ef7eb7 100644 --- a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp +++ b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp @@ -34,8 +34,6 @@ Dwarf::assemble $asm_file { declare_labels char_type1_label char_type2_label global srcdir subdir srcfile - extern main - # The partial units are laid out so we're not dependent on the order that # they appear in compunit_symtab.includes. We need the one with the # opaque definition to appear first to gdb, so we put it in the middle. diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index 21dc0f62d4d..f745b2ae313 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -822,15 +822,6 @@ namespace eval Dwarf { _emit "${name}:" } - # Declare a global label. This is typically used to refer to - # labels defined in other files, for example a function defined in - # a .c file. - proc extern {args} { - foreach name $args { - _op .global $name - } - } - # A higher-level interface to label handling. # # ARGS is a list of label descriptors. Each one is either a