aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiemo Seufer <ths@networkno.de>2002-05-21 16:21:18 +0000
committerThiemo Seufer <ths@networkno.de>2002-05-21 16:21:18 +0000
commit21611032e14f407e8baf21ce190ea2b27c416917 (patch)
tree72803646a37c3c97281a6315c8eebbf41d36cea2
parent41241523bf023fabf97f1df7b02940347e45cd2f (diff)
downloadgdb-21611032e14f407e8baf21ce190ea2b27c416917.zip
gdb-21611032e14f407e8baf21ce190ea2b27c416917.tar.gz
gdb-21611032e14f407e8baf21ce190ea2b27c416917.tar.bz2
* 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.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/bfd.c1
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/objdump.c6
4 files changed, 15 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ccb0bb1..db0f945 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
2002-05-21 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+ * bfd/bfd.c (bfd_get_arch_size): Remove bfd_set_error call for
+ non-ELF targets.
+
+2002-05-21 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
* elf-bfd.h (elf_backend_emit_relocs): Change prototype to return
an error value.
* elflink.h (elf_link_output_relocs): Likewise. Improve error message.
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 9de4d53..0e72b0b 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 a4b8bfb..ec724ed 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-21 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+ * objdump.c (dump_headers): Fix output formatting for ELF32
+ architectures in a BFD64 enabled toolchain.
+
2002-05-20 Kazu Hirata <kazu@cs.umass.edu>
* debug.c: Fix formatting.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 535e0cd..715d1cb 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)