From 21611032e14f407e8baf21ce190ea2b27c416917 Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Tue, 21 May 2002 16:21:18 +0000 Subject: [PATCH] * objdump.c (dump_headers): Fix output formatting for ELF32 architectures in a BFD64 enabled toolchain. * bfd/bfd.c (bfd_get_arch_size): Remove bfd_set_error call for non-ELF targets. --- bfd/ChangeLog | 5 +++++ bfd/bfd.c | 1 - binutils/ChangeLog | 5 +++++ binutils/objdump.c | 6 +++++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ccb0bb1685..db0f945fff 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2002-05-21 Thiemo Seufer + + * bfd/bfd.c (bfd_get_arch_size): Remove bfd_set_error call for + non-ELF targets. + 2002-05-21 Thiemo Seufer * elf-bfd.h (elf_backend_emit_relocs): Change prototype to return diff --git a/bfd/bfd.c b/bfd/bfd.c index 9de4d53d4d..0e72b0ba99 100644 --- a/bfd/bfd.c +++ b/bfd/bfd.c @@ -749,7 +749,6 @@ bfd_get_arch_size (abfd) if (abfd->xvec->flavour == bfd_target_elf_flavour) return (get_elf_backend_data (abfd))->s->arch_size; - bfd_set_error (bfd_error_wrong_format); return -1; } diff --git a/binutils/ChangeLog b/binutils/ChangeLog index a4b8bfbce6..ec724ed72c 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2002-05-21 Thiemo Seufer + + * objdump.c (dump_headers): Fix output formatting for ELF32 + architectures in a BFD64 enabled toolchain. + 2002-05-20 Kazu Hirata * debug.c: Fix formatting. diff --git a/binutils/objdump.c b/binutils/objdump.c index 535e0cd7e7..715d1cbf1c 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -361,7 +361,11 @@ dump_headers (abfd) #ifndef BFD64 printf (_("Idx Name Size VMA LMA File off Algn")); #else - printf (_("Idx Name Size VMA LMA File off Algn")); + /* With BFD64, non-ELF returns -1 and wants always 64 bit addresses. */ + if (bfd_get_arch_size (abfd) == 32) + printf (_("Idx Name Size VMA LMA File off Algn")); + else + printf (_("Idx Name Size VMA LMA File off Algn")); #endif if (wide_output)