[PATCH v2 13/13] gdb: update message in symbol_file_add_with_addrs after changes in readnow_functions

Jan Vrany
2025-11-24T20:07:50Z

When loading a file with -readnow, GDB prints message like:

Reading symbols from some_program...
Expanding full symbols from some_program...

I assume the reason for the second message ("Expanding ...") is to let
the user know what's happening as symbol expansion may take time.

However after commit "gdb: implement readnow_functions::expand_all_symtabs"
no actual work is done in expand_all_symtabs (for objfiles with DWARF
info at least) so printing "Expanding full..." felt bit odd.

This commit therefore checks if there are any unexpanded CUs and if
so, prints "Expanding full..." message as before. If all CUs are already
expanded, say just "Expanded full...".

This commit also updates a number of tests to accommodate this change.

This is user-facing change.
---
gdb/symfile.c | 17 +++++++++++++----
gdb/testsuite/gdb.base/bfd-errors.exp | 2 +-
gdb/testsuite/gdb.base/cached-source-file.exp | 2 +-
gdb/testsuite/gdb.base/code_elim.exp | 10 +++++-----
gdb/testsuite/gdb.base/relocate.exp | 12 ++++++------
gdb/testsuite/gdb.base/style.exp | 2 +-
gdb/testsuite/gdb.base/sym-file.exp | 4 ++--
gdb/testsuite/gdb.cp/cp-relocate.exp | 2 +-
.../build-id-no-debug-warning.exp | 6 +++---
gdb/testsuite/gdb.debuginfod/crc_mismatch.exp | 4 ++--
gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp | 2 +-
.../gdb.dwarf2/dw2-objfile-overlap.exp | 2 +-
.../gdb.dwarf2/dw2-using-debug-str.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp | 2 +-
gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp | 2 +-
gdb/testsuite/gdb.multi/remove-inferiors.exp | 2 +-
gdb/testsuite/gdb.server/target-exec-file.exp | 4 ++--
gdb/testsuite/gdb.threads/detach-step-over.exp | 2 +-
gdb/testsuite/lib/gdb.exp | 2 +-
19 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 11388772ff5..f0f44bca8c5 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1088,11 +1088,20 @@ symbol_file_add_with_addrs (const gdb_bfd_ref_ptr &abfd, const char *name,

if ((flags & OBJF_READNOW))
{
- if (should_print)
- gdb_printf (_("Expanding full symbols from %ps...\n"),
- styled_string (file_name_style.style (), name));
+ if (objfile->has_unexpanded_symtabs ())
+ {
+ if (should_print)
+ gdb_printf (_ ("Expanding full symbols from %ps...\n"),
+ styled_string (file_name_style.style (), name));

- objfile->expand_all_symtabs ();
+ objfile->expand_all_symtabs ();
+ }
+ else
+ {
+ if (should_print)
+ gdb_printf (_ ("Expanded full symbols from %ps.\n"),
+ styled_string (file_name_style.style (), name));
+ }
}

/* Note that we only print a message if we have no symbols and have
diff --git a/gdb/testsuite/gdb.base/bfd-errors.exp b/gdb/testsuite/gdb.base/bfd-errors.exp
index 2e3847820e9..a920b799ea9 100644
--- a/gdb/testsuite/gdb.base/bfd-errors.exp
+++ b/gdb/testsuite/gdb.base/bfd-errors.exp
@@ -161,7 +161,7 @@ gdb_test_multiple "add-symbol-file -readnow $binfile_lib" \
incr bfd_error_count($expect_out(1,string))
exp_continue
}
- -re "Expanding full symbols from.*$gdb_prompt $" {
+ -re "Expand(ing|ed) full symbols from.*$gdb_prompt $" {
pass $gdb_test_name
}
}
diff --git a/gdb/testsuite/gdb.base/cached-source-file.exp b/gdb/testsuite/gdb.base/cached-source-file.exp
index 73d9359be9f..7637d35a832 100644
--- a/gdb/testsuite/gdb.base/cached-source-file.exp
+++ b/gdb/testsuite/gdb.base/cached-source-file.exp
@@ -93,7 +93,7 @@ set binregex [string_to_regexp $binfile]
set re \
[multi_line \
"\\`$binregex\\' has changed; re-reading symbols\\.(" \
- "Expanding full symbols from $binfile\\.\\.\\.)?" \
+ "Expand(ing|ed) full symbols from $binfile\\.(\\.\\.)?)?" \
"Starting program: ${binregex}.*"]
gdb_test "run" $re "rerun program" $q y

diff --git a/gdb/testsuite/gdb.base/code_elim.exp b/gdb/testsuite/gdb.base/code_elim.exp
index 0270bc92c84..375cf1d276d 100644
--- a/gdb/testsuite/gdb.base/code_elim.exp
+++ b/gdb/testsuite/gdb.base/code_elim.exp
@@ -80,7 +80,7 @@ gdb_exit
gdb_start

gdb_test "symbol-file ${binfile1}" \
- "Reading symbols from .*${testfile1}\\.\\.\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
+ "Reading symbols from .*${testfile1}\\.(\\.\\.)?(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
"symbol-file ${testfile1}"

with_test_prefix "single psymtabs" {
@@ -113,13 +113,13 @@ gdb_start

with_test_prefix "order1" {
gdb_test "add-symbol-file ${binfile1} 0x100000 -s .bss 0x120000" \
- "Reading symbols from .*${testfile1}\\.\\.\\." \
+ "Reading symbols from .*${testfile1}\\.(\\.\\.)?" \
"add-symbol-file ${testfile1} 0x100000" \
"add symbol table from file \".*${testfile1}\" at.*\\(y or n\\) " \
"y"

gdb_test "add-symbol-file ${binfile2} 0x200000 -s .data 0x210000 -s .bss 0x220000" \
- "Reading symbols from .*${testfile2}\\.\\.\\." \
+ "Reading symbols from .*${testfile2}\\.(\\.\\.)?" \
"add-symbol-file ${testfile2} 0x200000" \
"add symbol table from file \".*${testfile2}\" at.*\\(y or n\\) " \
"y"
@@ -137,13 +137,13 @@ gdb_start

with_test_prefix "order2" {
gdb_test "add-symbol-file ${binfile2} 0x200000 -s .data 0x210000 -s .bss 0x220000" \
- "Reading symbols from .*${testfile2}\\.\\.\\." \
+ "Reading symbols from .*${testfile2}\\.(\\.\\.)?" \
"add-symbol-file ${testfile2} 0x200000" \
"add symbol table from file \".*${testfile2}\" at.*\\(y or n\\) " \
"y"

gdb_test "add-symbol-file ${binfile1} 0x100000 -s .bss 0x120000" \
- "Reading symbols from .*${testfile1}\\.\\.\\." \
+ "Reading symbols from .*${testfile1}\\.(\\.\\.)?" \
"add-symbol-file ${testfile1} 0x100000" \
"add symbol table from file \".*${testfile1}\" at.*\\(y or n\\) " \
"y"
diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/relocate.exp
index db42885374c..93cca28eae3 100644
--- a/gdb/testsuite/gdb.base/relocate.exp
+++ b/gdb/testsuite/gdb.base/relocate.exp
@@ -114,11 +114,11 @@ gdb_test_multiple "add-symbol-file -s -section-name 0x200 $binfile 0x100" $test
# Since we're here, might as well test the 'symbol-file' command and
# if its arguments can also be passed at any position.
gdb_test "symbol-file -readnow $binfile" \
- "Reading symbols from ${binfile}\.\.\.\r\nExpanding full symbols from ${binfile}\.\.\." \
+ "Reading symbols from ${binfile}\.\.\.\r\nExpand(ing|ed) full symbols from ${binfile}\.(\.\.)?" \
"symbol-file with -readnow first"
clean_restart
gdb_test "symbol-file $binfile -readnow" \
- "Reading symbols from ${binfile}\.\.\.\r\nExpanding full symbols from ${binfile}\.\.\." \
+ "Reading symbols from ${binfile}\.\.\.\r\nExpand(ing|ed) full symbols from ${binfile}\.(\.\.)?" \
"symbol-file with -readnow second"
gdb_test "symbol-file -readnow" \
"no symbol file name was specified" \
@@ -128,7 +128,7 @@ gdb_test "symbol-file -- -non-existent-file" \
"symbol-file with -- disables option processing"
clean_restart
gdb_test "symbol-file -readnow -- $binfile" \
- "Reading symbols from ${binfile}\.\.\.\r\nExpanding full symbols from ${binfile}\.\.\." \
+ "Reading symbols from ${binfile}\.\.\.\r\nExpand(ing|ed) full symbols from ${binfile}\.(\.\.)?" \
"symbol-file with -- and -readnow"
gdb_test "symbol-file -- $binfile -readnow" \
"Unrecognized argument \"-readnow\"" \
@@ -144,8 +144,9 @@ gdb_test "add-symbol-file ${binfile} 0 -s .whatever" \
"add-symbol-file missing address"

# Load the object file.
+set readnow_re "Expand(ing|ed) full symbols from ${binfile}\.(\.\.)?"
gdb_test "add-symbol-file ${binfile} 0" \
- "Reading symbols from .*${testfile}\\.o\\.\\.\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
+ "Reading symbols from .*${testfile}\\.o\\.\\.\\.(\r\n$readnow_re)?(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
"add-symbol-file ${testfile}.o 0" \
"add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_addr = 0x0\[\r\n\]+\\(y or n\\) " \
"y"
@@ -198,7 +199,7 @@ gdb_test_no_output "set \$offset = 0x10000"

# Load the object file.
gdb_test "add-symbol-file ${binfile} \$offset" \
- "Reading symbols from .*${testfile}\\.o\\.\\.\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
+ "Reading symbols from .*${testfile}\\.o\\.\\.\\.(\r\n$readnow_re)?(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
"add-symbol-file ${testfile}.o \$offset" \
"add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_addr = 0x10000\[\r\n\]+\\(y or n\\) " \
"y"
@@ -218,7 +219,6 @@ if { "${function_foo_addr}" == "${new_function_foo_addr}" } {

set offset 0x10000
clean_restart
-set readnow_re "Expanding full symbols from ${binfile}\.\.\."
gdb_test "symbol-file -o $offset $binfile" \
"Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \
"symbol-file with offset"
diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp
index 222f17ee096..2553f3adc82 100644
--- a/gdb/testsuite/gdb.base/style.exp
+++ b/gdb/testsuite/gdb.base/style.exp
@@ -281,7 +281,7 @@ proc run_style_tests { } {
set pass_re \
[multi_line \
$pass_re \
- "Expanding full symbols from [limited_style $quoted file]\.\.\."]
+ "Expand(ing|ed) full symbols from [limited_style $quoted file]\.(\.\.)?"]
}
gdb_test "file $binfile" \
$pass_re \
diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/sym-file.exp
index 13febdac2db..78cd725bd0b 100644
--- a/gdb/testsuite/gdb.base/sym-file.exp
+++ b/gdb/testsuite/gdb.base/sym-file.exp
@@ -91,7 +91,7 @@ proc do_test { remove_expr } {

# 3) Add the library's symbols using 'add-symbol-file'.
set result [gdb_test "add-symbol-file ${lib_syms} addr" \
- "Reading symbols from .*${lib_syms}\\.\\.\\." \
+ "Reading symbols from .*${lib_syms}\\.(\\.\\.)?" \
"add-symbol-file ${lib_basename}.so addr" \
"add symbol table from file \".*${lib_basename}\\.so\"\
at.*\\(y or n\\) " \
@@ -175,7 +175,7 @@ proc do_test { remove_expr } {

# Load the library's symbols.
gdb_test "add-symbol-file ${lib_syms} addr" \
- "Reading symbols from .*${lib_syms}\\.\\.\\." \
+ "Reading symbols from .*${lib_syms}\\.(\\.\\.)?" \
"add-symbol-file ${lib_basename}.so addr" \
"add symbol table from file \".*${lib_syms}\"\
at.*\\(y or n\\) " \
diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp
index 836f5fb6158..493ff57085e 100644
--- a/gdb/testsuite/gdb.cp/cp-relocate.exp
+++ b/gdb/testsuite/gdb.cp/cp-relocate.exp
@@ -121,7 +121,7 @@ clean_restart
set host_binfile [gdb_remote_download host $binfile]

gdb_test "add-symbol-file $host_binfile 0 -s ${func1_sec} 0x10000 -s ${func2_sec} 0x20000" \
- "Reading symbols from .*${testfile}\\.o\\.\\.\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
+ "Reading symbols from .*${testfile}\\.o\\.(\\.\\.)?(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
"add-symbol-file ${testfile}.o" \
"add symbol table from file \".*${testfile}\\.o\" at.*\\(y or n\\) " \
"y"
diff --git a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
index e56538f721d..59251cad909 100644
--- a/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
+++ b/gdb/testsuite/gdb.debuginfod/build-id-no-debug-warning.exp
@@ -79,7 +79,7 @@ gdb_test_no_output "set debug-file-directory ${debug_file_directory}" \

# Now load the file into GDB, and look for the warning.
set debug_file_re [string_to_regexp $build_id_debug_file]
-set expanding_re "\r\nExpanding full symbols from $debug_file_re\\.\\.\\."
+set expanding_re "\r\nExpand(ing|ed) full symbols from $debug_file_re\\.(.\\.\\.)?"
gdb_test "file ${build_id_debug_file}" \
[multi_line \
"Reading symbols from $debug_file_re\\.\\.\\.($expanding_re)?" \
@@ -98,7 +98,7 @@ with_test_prefix "check styling" {

# Now load the file into GDB, and look for the warning.
set debug_file_re [style [string_to_regexp $build_id_debug_file] file]
- set expanding_re "\r\nExpanding full symbols from $debug_file_re\\.\\.\\."
+ set expanding_re "\r\nExpand(ing|ed) full symbols from $debug_file_re\\.(\\.\\.)?"

gdb_test "file ${build_id_debug_file}" \
[multi_line \
@@ -142,7 +142,7 @@ proc_with_prefix local_debuginfod { } {
[multi_line \
"Reading symbols from ${build_id_debug_file}\\.\\.\\." \
"Downloading\[^\r\n\]*separate debug info for ${build_id_debug_file}\\.\\.\\." \
- "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpanding full symbols from \[^\r\n\]+)*"] \
+ "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpand(ing|ed) full symbols from \[^\r\n\]+)*"] \
"debuginfod running, info downloaded, no warnings"
}

diff --git a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
index 2771d333d46..785088e95bb 100644
--- a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
+++ b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp
@@ -47,7 +47,7 @@ remote_exec build "mkdir $debugdir"
remote_exec build "mkdir -p [file dirname $debugfile]"
remote_exec build "mv -f [standard_output_file ${testfile}.debug] $debugfile"

-set expanding_re "\r\nExpanding full symbols from .+\\.\\.\\."
+set expanding_re "\r\nExpand(ing|ed) full symbols from .+\\.(\\.\\.)?"

# Test CRC mismatch is reported.
if {[build_executable crc_mismatch.exp crc_mismatch-2 crc_mismatch-2.c debug] != -1
@@ -124,7 +124,7 @@ proc_with_prefix local_debuginfod { } {
[multi_line \
"Reading symbols from ${escapedobjdirsubdir}/crc_mismatch-2\\.\\.\\." \
"Downloading.*separate debug info for ${escapedobjdirsubdir}/crc_mismatch-2\\.\\.\\." \
- "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpanding full symbols from \[^\r\n\]+)*"] \
+ "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpand(ing|ed) full symbols from \[^\r\n\]+)*"] \
"debuginfod running, info downloaded, no CRC mismatch"
}

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp
index 998b614a193..60e1cb62208 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp
@@ -63,7 +63,7 @@ set pattern1 \
set pattern2 \
[multi_line \
"Reading symbols from \[^\r\n\]+" \
- "Expanding full symbols from \[^\r\n\]+" \
+ "Expand(ing|ed) full symbols from \[^\r\n\]+" \
"DWARF Error: unexpected tag 'DW_TAG_subprogram' at offset $hex"]

# Load the executable, we expect an error from the DWARF parser.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp b/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp
index 25b3c0ee2e3..47ff7a0b9f0 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-objfile-overlap.exp
@@ -37,7 +37,7 @@ clean_restart $executable_outer
set host_binfile_inner [gdb_remote_download host $binfile_inner]

gdb_test "add-symbol-file $host_binfile_inner outer_inner" \
- {Reading symbols from .*\.\.\.} "add-symbol-file" \
+ {Reading symbols from .*\.(\.\.)?} "add-symbol-file" \
"\r\n\t\\.text_addr = 0x\[0-9a-f\]+\r\n\\(y or n\\) \$" "y"

# Expand symtab for ${binfile_outer}.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp
index 5349cc4b00d..20f1abc2ca8 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp
@@ -158,7 +158,7 @@ set pattern1 \
set pattern2 \
[multi_line \
$line1 \
- "Expanding full symbols from \[^\r\n\]+" \
+ "Expand(ing|ed) full symbols from \[^\r\n\]+" \
$dwarf_error]

# This pattern is hit when gcc adds an index (e.g. running with
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
index 79e48b24af1..2f16107dc48 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp
@@ -173,7 +173,7 @@ foreach_with_prefix ranges_sect {ranges rnglists} {
# Expanded full symbols from ...
#
set complaint_re \
- "${complaint_re}(\r\nExpanding full .*)?"
+ "${complaint_re}(\r\nExpand(ing|ed) full .*)?"

set readnow_p [readnow]

diff --git a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp b/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp
index 0ae36128a70..453368b3842 100644
--- a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp
+++ b/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp
@@ -63,7 +63,7 @@ proc load_binary { method } {
gdb_test_no_output "set index-cache enabled off"
} elseif { $method == "readnow" } {
gdb_test "file -readnow $::host_binfile" \
- "Reading symbols from .*Expanding full symbols from .*" \
+ "Reading symbols from .*Expand(ing|ed) full symbols from .*" \
"file readnow"
} else {
error "unknown method"
diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index 52e6cb060a6..58285a57465 100644
--- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -50,7 +50,7 @@ proc test_remove_inferiors { } {
set binfile_re [string_to_regexp ${binfile}]
gdb_test "file ${binfile}" \
[multi_line "Reading symbols from ${binfile_re}\.\.\.(" \
- "Expanding full symbols from ${binfile_re}\.\.\.)?" ] \
+ "Expand(ing|ed) full symbols from ${binfile_re}\.(\.\.)?)?" ] \
"load binary"

if {![runto_main]} {
diff --git a/gdb/testsuite/gdb.server/target-exec-file.exp b/gdb/testsuite/gdb.server/target-exec-file.exp
index 8705217fdf8..567c6d9c7f8 100644
--- a/gdb/testsuite/gdb.server/target-exec-file.exp
+++ b/gdb/testsuite/gdb.server/target-exec-file.exp
@@ -118,7 +118,7 @@ gdb_test_multiple "file target:$target_exec" "run file command" {
exp_continue
}

- -re "^Expanding full symbols from \[^\r\n\]+\r\n" {
+ -re "^Expand(ing|ed) full symbols from \[^\r\n\]+\r\n" {
exp_continue
}

@@ -171,7 +171,7 @@ proc start_inferior { testname expect_reread } {
-re "^Reading \[^\r\n\]+ from remote target\\.\\.\\.\r\n" {
exp_continue
}
- -re "^Expanding full symbols from \[^\r\n\]+\\.\\.\\.\r\n" {
+ -re "^Expand(ing|ed) full symbols from \[^\r\n\]+\\.\\.\\.\r\n" {
exp_continue
}
-re "^Temporary breakpoint $::decimal at $::hex: \[^\r\n\]+\r\n" {
diff --git a/gdb/testsuite/gdb.threads/detach-step-over.exp b/gdb/testsuite/gdb.threads/detach-step-over.exp
index 98b412cfcfd..92e3e58a97c 100644
--- a/gdb/testsuite/gdb.threads/detach-step-over.exp
+++ b/gdb/testsuite/gdb.threads/detach-step-over.exp
@@ -88,7 +88,7 @@ proc attach_to {testpid} {
# Seen when "set debug libthread_db" is on.
exp_continue
}
- -re "Reading symbols from|Expanding full symbols from" {
+ -re "Reading symbols from|Expand(ing|ed) full symbols from" {
# Prevent -readnow timeout.
exp_continue
}
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 82bb511bccc..5cad00719f6 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -7777,7 +7777,7 @@ proc gdb_load_no_complaints { arg } {
set re \
[multi_line \
"^(Reading symbols from \[^\r\n\]*" \
- ")+(Expanding full symbols from \[^\r\n\]*" \
+ ")+(Expand(ing|ed) full symbols from \[^\r\n\]*" \
")?$gdb_prompt $"]
gdb_assert {[regexp $re $gdb_file_cmd_msg]} "No complaints"
}
--
2.51.0