From f568655424ad268c8c5df3f56e4e19a86b16623d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 4 Jun 2019 13:35:44 -0600 Subject: [PATCH] Warn if add-symbol-file does not provide any symbols A user suggested that add-symbol-file ought to warn if the file does not in fact provide any symbols. This seemed like a decent idea, so this patch implements this idea. Tested on x86-64 Fedora 29. gdb/ChangeLog 2019-06-14 Tom Tromey * symfile.c (add_symbol_file_command): Remove obsolete comment. Warn if symbol file does not provide any symbols. gdb/testsuite/ChangeLog 2019-06-14 Tom Tromey * gdb.base/symfile-warn.exp: New file. * gdb.base/symfile-warn.c: New file. --- gdb/ChangeLog | 5 +++++ gdb/symfile.c | 9 +++----- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/symfile-warn.c | 18 +++++++++++++++ gdb/testsuite/gdb.base/symfile-warn.exp | 30 +++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 gdb/testsuite/gdb.base/symfile-warn.c create mode 100644 gdb/testsuite/gdb.base/symfile-warn.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 87575c80610..146b18138d2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-06-14 Tom Tromey + + * symfile.c (add_symbol_file_command): Remove obsolete comment. + Warn if symbol file does not provide any symbols. + 2019-06-14 Tom Tromey * source.c (find_and_open_source): Respect basenames_may_differ. diff --git a/gdb/symfile.c b/gdb/symfile.c index 26762d289ca..6f9c81c8b94 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -2211,12 +2211,6 @@ set_objfile_default_section_offset (struct objfile *objf, /* This function allows the addition of incrementally linked object files. It does not modify any state in the target, only in the debugger. */ -/* Note: ezannoni 2000-04-13 This function/command used to have a - special case syntax for the rombug target (Rombug is the boot - monitor for Microware's OS-9 / OS-9000, see remote-os9k.c). In the - rombug case, the user doesn't need to supply a text address, - instead a call to target_link() (in target.c) would supply the - value to use. We are now discontinuing this type of ad hoc syntax. */ static void add_symbol_file_command (const char *args, int from_tty) @@ -2358,6 +2352,9 @@ add_symbol_file_command (const char *args, int from_tty) objf = symbol_file_add (filename.get (), add_flags, §ion_addrs, flags); + if (!objfile_has_symbols (objf) && objf->per_bfd->minimal_symbol_count <= 0) + warning (_("newly-added symbol file \"%s\" does not provide any symbols"), + filename.get ()); if (seen_offset) set_objfile_default_section_offset (objf, section_addrs, offset); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4d896692648..74e67412805 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-06-14 Tom Tromey + + * gdb.base/symfile-warn.exp: New file. + * gdb.base/symfile-warn.c: New file. + 2019-06-14 Tom Tromey * gdb.base/annotate-symlink.exp: New file. diff --git a/gdb/testsuite/gdb.base/symfile-warn.c b/gdb/testsuite/gdb.base/symfile-warn.c new file mode 100644 index 00000000000..38fdd671034 --- /dev/null +++ b/gdb/testsuite/gdb.base/symfile-warn.c @@ -0,0 +1,18 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2019 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Empty. */ diff --git a/gdb/testsuite/gdb.base/symfile-warn.exp b/gdb/testsuite/gdb.base/symfile-warn.exp new file mode 100644 index 00000000000..1fd96184f87 --- /dev/null +++ b/gdb/testsuite/gdb.base/symfile-warn.exp @@ -0,0 +1,30 @@ +# Copyright 2019 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +standard_testfile .c +set ofile [standard_output_file ${testfile}.o] + +if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" \ + $ofile object {debug}] != ""} { + untested "failed to compile" + return -1 +} + +clean_restart + +gdb_test "add-symbol-file $ofile 0" \ + "Reading symbols from .*warning: newly-added symbol file.*does not provide any symbols" \ + "add-symbol-file" \ + "add symbol table from file \".*\" at.*\\(y or n\\) " "y" -- 2.30.2