[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

diff --git a/gdb/dwarf2/error.h b/gdb/dwarf2/error.h
index 33146240abaf2f13a220dd05038670610366fbe5..f8861f21e9a9a277bc66a5431f413435efd3833e 100644 (file)
--- a/gdb/dwarf2/error.h
+++ b/gdb/dwarf2/error.h
@@ -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 ": "

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp
index 547ab819f53d620d54d6080c0ca7ab8570c399ec..d6b8d2e6f524bb130f98357ce4d91296fd0019af 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.exp
@@ -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"
 }

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-error.exp
index 8081e7fc7cdcefbe9b79ef6b531fcafa7f2471ef..526b39416a9091e692a69fcdc203df598e5015e5 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-error.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-error.exp
@@ -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.

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp
index 3eadeb27d9cd529f04a1272a01ec70927b71753f..f84142ab3532a07a1888507a0ee75c2b36be6d93 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp
@@ -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" {

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp
index cd3dd0b26b85c732c0b0198da0f3a377ad18d38f..c84a53007456a7f633c137323d9f511c37ba35cf 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp
@@ -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).

diff --git a/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp b/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp
index 111de438bdab2d09272260124cafb3d8795055aa..00af7251f9d1d1a3569b5e60b323b57e8e025012 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp
+++ b/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp
@@ -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"