2008-12-15 Paul Pluzhnikov <ppluzhnikov@google.com>

[deliverable/binutils-gdb.git] / bfd / bfd.c

diff --git a/bfd/bfd.c b/bfd/bfd.c
index 1900c144e6f0bbf00471894caffe7e2df9fff620..847da522ab0ccbaba1d639c03e1afac89bd26f63 100644 (file)
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -1475,9 +1475,8 @@ is32bit (bfd *abfd)
       return bed->s->elfclass == ELFCLASS32;
     }
 
-  /* For non-ELF, make a guess based on the target name.  */
-  return (strstr (bfd_get_target (abfd), "64") == NULL
-         && strcmp (bfd_get_target (abfd), "mmo") != 0);
+  /* For non-ELF targets, use architecture information.  */
+  return bfd_arch_bits_per_address (abfd) <= 32;
 }
 #endif