gdb: is_linked_with_cygwin_dll: mention filename in warning messages

When a warning is displayed, it isn't clear to the user which file is
the cause of the warning.  Add the filename in there.  Remove the
"Failed to parse .idata section" part, since the .idata section is
always mentioned one way or another anyway, so it just contributes to
make the message longer than it needs to be.

gdb/ChangeLog:

	* windows-tdep.c (is_linked_with_cygwin_dll): Add filename to
	warning messages.
This commit is contained in:
Simon Marchi 2020-04-16 15:46:16 -04:00
parent 00ac85d375
commit 1619720823
2 changed files with 13 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2020-04-16 Simon Marchi <simon.marchi@polymtl.ca>
* windows-tdep.c (is_linked_with_cygwin_dll): Add filename to
warning messages.
2020-04-16 Simon Marchi <simon.marchi@polymtl.ca>
* windows-tdep.c (is_linked_with_cygwin_dll): Consider case where

View File

@ -1030,7 +1030,8 @@ section's range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
gdb::byte_vector idata_contents;
if (!gdb_bfd_get_full_section_contents (abfd, idata_section, &idata_contents))
{
warning (_("Failed to get content of .idata section."));
warning (_("%s: failed to get contents of .idata section."),
bfd_get_filename (abfd));
return false;
}
@ -1046,8 +1047,8 @@ section's range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
/* Is there enough space left in the section for another entry? */
if (iter + sizeof (pe_import_directory_entry) > end)
{
warning (_("Failed to parse .idata section: unexpected end of "
".idata section."));
warning (_("%s: unexpected end of .idata section."),
bfd_get_filename (abfd));
break;
}
@ -1065,9 +1066,10 @@ section's range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
if (name_va < idata_section_va || name_va >= idata_section_end_va)
{
warning (_("\
Failed to parse .idata section: name's virtual address (0x%" BFD_VMA_FMT "x) \
is outside .idata section's range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
name_va, idata_section_va, idata_section_end_va);
%s: name's virtual address (0x%" BFD_VMA_FMT "x) is outside .idata section's \
range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
bfd_get_filename (abfd), name_va, idata_section_va,
idata_section_end_va);
break;
}