darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1999-10-27 Fred Fish <fnf@cygnus.com>

Browse source 
* objdump.c (display_bfd): Break into two functions.  The
	actual dumping code moves to dump_bfd.  If bfd is not
	unambiguously recognized as a bfd_object, attempt to dump
	it as a bfd_core.
	(dump_bfd): New function.
This commit is contained in:
Ian Lance Taylor 1999-10-28 03:30:13 +00:00
parent acb5662391
commit d24de309df
2 changed files with 52 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
binutils/ChangeLog
View file

@ -1,3 +1,11 @@
1999-10-27 Fred Fish <fnf@cygnus.com>
* objdump.c (display_bfd): Break into two functions. The
actual dumping code moves to dump_bfd. If bfd is not
unambiguously recognized as a bfd_object, attempt to dump
it as a bfd_core.
(dump_bfd): New function.
1999-10-26 Nick Clifton <nickc@cygnus.com> 1999-10-26 Nick Clifton <nickc@cygnus.com>
* dlltool.c (assemble_file): Remove spurious test of exp_name. * dlltool.c (assemble_file): Remove spurious test of exp_name.

58
binutils/objdump.c
View file

@ -2042,23 +2042,12 @@ bfd *abfd;
bfd_print_private_bfd_data (abfd, stdout); bfd_print_private_bfd_data (abfd, stdout);
} }
/* Dump selected contents of ABFD */
static void static void
display_bfd (abfd) dump_bfd (abfd)
bfd *abfd; bfd *abfd;
{ {
char **matching;
if (!bfd_check_format_matches (abfd, bfd_object, &matching))
{
nonfatal (bfd_get_filename (abfd));
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
return;
}
/* If we are adjusting section VMA's, change them all now. Changing /* If we are adjusting section VMA's, change them all now. Changing
the BFD information is a hack. However, we must do it, or the BFD information is a hack. However, we must do it, or
bfd_find_nearest_line will not do the right thing. */ bfd_find_nearest_line will not do the right thing. */
@ -2134,6 +2123,47 @@ display_bfd (abfd)
} }
} }
static void
display_bfd (abfd)
bfd *abfd;
{
char **matching;
if (bfd_check_format_matches (abfd, bfd_object, &matching))
{
dump_bfd (abfd);
return;
}
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
nonfatal (bfd_get_filename (abfd));
list_matching_formats (matching);
free (matching);
return;
}
if (bfd_get_error () != bfd_error_file_not_recognized)
{
nonfatal (bfd_get_filename (abfd));
return;
}
if (bfd_check_format_matches (abfd, bfd_core, &matching))
{
dump_bfd (abfd);
return;
}
nonfatal (bfd_get_filename (abfd));
if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
}
static void static void
display_file (filename, target) display_file (filename, target)
char *filename; char *filename;