diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2020-12-04 15:08:54 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2020-12-04 15:08:54 -0500 |
| commit | e633b1172a5cf5d099644474e03f9228dc870b25 (patch) | |
| tree | 4a43014e2e91b2b8f37c96f430976c1aaf838e85 | |
| parent | ab954e4a53cab8c33728e6708695abc1616c90b1 (diff) | |
| download | gdb-e633b1172a5cf5d099644474e03f9228dc870b25.zip gdb-e633b1172a5cf5d099644474e03f9228dc870b25.tar.gz gdb-e633b1172a5cf5d099644474e03f9228dc870b25.tar.bz2 | |
gdb/testsuite: make declare_labels use better default label names
When using the single-element form of argument to declare_labels, the
generated label (in the assembly file) is of the format ".LlabelN",
where N is a number.
I propose making it use the name of the label by default. Calling:
declare_labels foo
will generate the ".LfooN" in the assembly file (again, where N is a
number). When debugging the output of the DWARF assembler, it makes it
easier to map labels to the source. Also, when defining the same label
twice by mistake in the Tcl code (like I d id), it's easier to track the
error from the message to the root cause:
-/home/smarchi/build/binutils-gdb/gdb/testsuite/outputs/gdb.dwarf2/implptrpiece/implptrpiece-dw.S:62: Error: symbol `.Llabel5' is already defined
+/home/smarchi/build/binutils-gdb/gdb/testsuite/outputs/gdb.dwarf2/implptrpiece/implptrpiece-dw.S:62: Error: symbol `.Lvar_label5' is already defined
This doesn't change anything for the test cases, it just makes the
assembly output a bit nicer.
gdb/testsuite/ChangeLog:
* lib/dwarf.exp (declare_labels): Use name as text if text is
not provided.
Change-Id: I63856c1fa6390498fd5b9d66f471f817ff0a465c
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/lib/dwarf.exp | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 57b7208..5de67b4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-12-04 Simon Marchi <simon.marchi@efficios.com> + + * lib/dwarf.exp (declare_labels): Use name as text if text is + not provided. + 2020-12-04 Tom de Vries <tdevries@suse.de> PR testsuite/26990 diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index c1596df..ecd438b 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -863,13 +863,13 @@ namespace eval Dwarf { set name [lindex $arg 0] set text [lindex $arg 1] - upvar $name label_var - if {$text == ""} { - set label_var [new_label] - } else { - set label_var [new_label $text] + if { $text == "" } { + set text $name } + upvar $name label_var + set label_var [new_label $text] + proc ${name}: {args} [format { define_label %s uplevel $args |