* elfcore.h (elf_core_file_p): Ensure we have a backend match

	with the correct arch size before rejecting the generic fallback.
	* elfcode.h (elf_object_p): Likewise.  Ensure arch size matches
	before accepting a target.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 30b06335dbc43da3fa43b75fb1616c60e6f92d0a..54da63c3e8d71ea67ec49bd3d4dd31f7392aa0d7 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-01  Alan Modra  <amodra@bigpond.net.au>
+           Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * elfcore.h (elf_core_file_p): Ensure we have a backend match
+       with the correct arch size before rejecting the generic fallback.
+       * elfcode.h (elf_object_p): Likewise.  Ensure arch size matches
+       before accepting a target.
+
 2008-08-01  Alan Modra  <amodra@bigpond.net.au>
 
        * elf.c (rewrite_elf_program_header): Don't wrap p_paddr to

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index c356638d088e2270c4502e5e2e1765274770afb9..b42229f007b7ea136a6f226b281d2634d1e8b328 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -574,6 +574,8 @@ elf_object_p (bfd *abfd)
     goto got_wrong_format_error;
 
   ebd = get_elf_backend_data (abfd);
+  if (ebd->s->arch_size != ARCH_SIZE)
+    goto got_wrong_format_error;
 
   /* Check that the ELF e_machine field matches what this particular
      BFD format expects.  */
@@ -595,6 +597,8 @@ elf_object_p (bfd *abfd)
          if ((*target_ptr)->flavour != bfd_target_elf_flavour)
            continue;
          back = xvec_get_elf_backend_data (*target_ptr);
+         if (back->s->arch_size != ARCH_SIZE)
+           continue;
          if (back->elf_machine_code == i_ehdrp->e_machine
              || (back->elf_machine_alt1 != 0
                  && back->elf_machine_alt1 == i_ehdrp->e_machine)

diff --git a/bfd/elfcore.h b/bfd/elfcore.h
index 9c51422624da37024320b5e45776992afd490a9e..f9d578860ecb1536dc845abeae2f570393e57ea2 100644 (file)
--- a/bfd/elfcore.h
+++ b/bfd/elfcore.h
@@ -159,6 +159,8 @@ elf_core_file_p (bfd *abfd)
          if ((*target_ptr)->flavour != bfd_target_elf_flavour)
            continue;
          back = xvec_get_elf_backend_data (*target_ptr);
+         if (back->s->arch_size != ARCH_SIZE)
+           continue;
          if (back->elf_machine_code == i_ehdrp->e_machine
              || (back->elf_machine_alt1 != 0
                  && i_ehdrp->e_machine == back->elf_machine_alt1)