From: Richard Henderson <rth@redhat.com>
Date: Thu, 2 Sep 2010 21:34:22 +0000 (+0000)
Subject:         * objdump.c (dump_dwarf): Use bfd_arch_bits_per_address.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=09fc85f6cf38328f30243107776dde8e3fece450;p=binutils-gdb.git

    * objdump.c (dump_dwarf): Use bfd_arch_bits_per_address.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 351fe4741fe..ed4030a8e28 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-23  Richard Henderson  <rth@redhat.com>
+
+	* objdump.c (dump_dwarf): Use bfd_arch_bits_per_address.
+
 2010-08-23  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elfedit.c (input_elf_osabi): New.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index f94dee968e2..ca7741d6fc2 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -2340,9 +2340,7 @@ dump_dwarf (bfd *abfd)
 {
   is_relocatable = (abfd->flags & (EXEC_P | DYNAMIC)) == 0;
 
-  /* FIXME: bfd_get_arch_size may return -1.  We assume that 64bit
-     targets will return 64.  */
-  eh_addr_size = bfd_get_arch_size (abfd) == 64 ? 8 : 4;
+  eh_addr_size = bfd_arch_bits_per_address (abfd) / 8;
 
   if (bfd_big_endian (abfd))
     byte_get = byte_get_big_endian;