espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-10-17 04:43:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gdb] Fix 'not in executable format' error message

Browse Source 
With trying to load a non-executable file into gdb, we run into PR26880:
...
$ gdb -q -batch test.c
"0x7ffc87bfc8d0s": not in executable format: \
  file format not recognized
...

The problem is caused by using %ps in combination with the error function
(note that confusingly, it does work in combination with the warning
function).

Fix this by using plain "%s" instead.

Tested on x86_64-linux.

gdb/ChangeLog:

2021-08-22  Tom de Vries  <tdevries@suse.de>

	PR gdb/26880
	* gdb/exec.c (exec_file_attach): Use %s instead of %ps in call to
	error function.

gdb/testsuite/ChangeLog:

2021-08-22  Tom de Vries  <tdevries@suse.de>

	PR gdb/26880
	* gdb.base/non-executable.exp: New file.
This commit is contained in:
Tom de Vries
2021-08-23 12:08:25 +02:00
parent 74cdc3e088
commit a9680e0e54
2 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/exec.c
View File

@ -453,9 +453,8 @@ exec_file_attach (const char *filename, int from_tty)
if (!current_program_space->exec_bfd ()) if (!current_program_space->exec_bfd ())
{ {
error (_("\"%ps\": could not open as an executable file: %s."), error (_("\"%s\": could not open as an executable file: %s."),
styled_string (file_name_style.style (), scratch_pathname), scratch_pathname, bfd_errmsg (bfd_get_error ()));
bfd_errmsg (bfd_get_error ()));
} }
/* gdb_realpath_keepfile resolves symlinks on the local /* gdb_realpath_keepfile resolves symlinks on the local
@ -475,8 +474,7 @@ exec_file_attach (const char *filename, int from_tty)
/* Make sure to close exec_bfd, or else "run" might try to use /* Make sure to close exec_bfd, or else "run" might try to use
it. */ it. */
current_program_space->exec_close (); current_program_space->exec_close ();
error (_("\"%ps\": not in executable format: %s"), error (_("\"%s\": not in executable format: %s"), scratch_pathname,
styled_string (file_name_style.style (), scratch_pathname),
gdb_bfd_errmsg (bfd_get_error (), matching).c_str ()); gdb_bfd_errmsg (bfd_get_error (), matching).c_str ());
} }

32
gdb/testsuite/gdb.base/non-executable.exp Normal file
View File

@ -0,0 +1,32 @@
# Copyright 2021 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 <http://www.gnu.org/licenses/>.
# Check that loading an existing but non-executable file
# results in the correct error message.
set binfile "$srcdir/$subdir/$gdb_test_file_name.exp"
clean_restart
set re \
[list \
"\"[string_to_regexp $binfile]\"" \
"not in executable format" \
"file format not recognized"]
set re [join $re ": "]
# Using gdb_load will generate a dejagnu ERROR, so use
# plain file command instead.
gdb_test "file $binfile" $re "error message"