[gdb/symtab] Change DWARF_ERROR from Dwarf Error to DWARF Error

It was suggested here [1] that the canonical prefix for dwarf errors
should not be "Dwarf Error: ", given that the canonical spelling is DWARF
instead of Dwarf.

Fix this by using "DWARF Error: " instead.

Given the use of DWARF_ERROR_PREFIX, that needs to be changed only in a single
location.

Tested on x86_64-linux.

Suggested-By: Tom Tromey <tom@tromey.com>
Approved-By: Tom Tromey <tom@tromey.com>

[1] https://sourceware.org/pipermail/gdb-patches/2024-August/211258.html
This commit is contained in:
Tom de Vries 2024-08-27 09:08:41 +02:00
parent 408dac3f45
commit b5070480d7
6 changed files with 7 additions and 7 deletions

View File

@ -21,7 +21,7 @@
#define GDB_DWARF2_ERROR_H
/* Canonical capitalization of "dwarf error". */
#define DWARF_ERROR "Dwarf Error"
#define DWARF_ERROR "DWARF Error"
/* Prefix to be used in dwarf errors. */
#define DWARF_ERROR_PREFIX DWARF_ERROR ": "

View File

@ -28,7 +28,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "
clean_restart $executable
# The first access (as we do not use -readnow) prints some:
# Dwarf Error: Cannot find DIE at 0x0 referenced from DIE at 0x29 [in module ...]
# DWARF Error: Cannot find DIE at 0x0 referenced from DIE at 0x29 [in module ...]
with_test_prefix "first" {
gdb_test "ptype f"
}

View File

@ -37,7 +37,7 @@ set host_binfile [gdb_remote_download host $binfile]
# First test that reading symbols fails.
gdb_test "file $host_binfile" \
{Reading symbols.*Dwarf Error: wrong version in compilation unit header \(is 153, should be 2, 3, 4 or 5\).*} \
{Reading symbols.*DWARF Error: wrong version in compilation unit header \(is 153, should be 2, 3, 4 or 5\).*} \
"file $testfile"
# We can't use proc readnow, because the PR makes it return 0.

View File

@ -56,7 +56,7 @@ gdb_test_no_output "maint set dwarf synchronous on"
set pattern1 \
[multi_line \
"Reading symbols from \[^\r\n\]+" \
"Dwarf Error: unexpected tag 'DW_TAG_subprogram' at offset $hex"]
"DWARF Error: unexpected tag 'DW_TAG_subprogram' at offset $hex"]
# This pattern is hit when GDB does use -readnow (e.g. running with
# --target_board=readnow).
@ -64,7 +64,7 @@ set pattern2 \
[multi_line \
"Reading symbols from \[^\r\n\]+" \
"Expanding full symbols from \[^\r\n\]+" \
"Dwarf Error: unexpected tag 'DW_TAG_subprogram' at offset $hex"]
"DWARF Error: unexpected tag 'DW_TAG_subprogram' at offset $hex"]
# Load the executable, we expect an error from the DWARF parser.
gdb_test_multiple "file $host_binfile" "file $testfile" {

View File

@ -131,7 +131,7 @@ clean_restart
gdb_test_no_output "maint set dwarf synchronous on"
set line1 "Reading symbols from \[^\r\n\]+"
set dwarf_error "Dwarf Error: DW_FORM_strp used without required section"
set dwarf_error "DWARF Error: DW_FORM_strp used without required section"
# This pattern is hit when GDB does not use -readnow (i.e. the default
# behaviour).

View File

@ -128,5 +128,5 @@ save_vars { GDBFLAGS } {
}
}
set re "Dwarf Error: .debug_types section not supported in dwz file"
set re "DWARF Error: .debug_types section not supported in dwz file"
gdb_assert { [regexp $re $gdb_file_cmd_msg] } "Dwarf Error message"