(elf_core_file_p): Compare alternate machine codes for ELF backends when

checking if the generic ELF target should be used.

2 files changed, 37 insertions, 33 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0a8081f..c91f825 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-14  Bob Wilson  <bob.wilson@acm.org>
+
+	* elfcore.h (elf_core_file_p): Compare alternate machine codes for ELF
+	backends when checking if the generic ELF target should be used.
+
 2003-02-14  Alan Modra  <amodra@bigpond.net.au>
 
 	* elf64-ppc.c (ppc64_elf_link_hash_table_create): Init tls_get_addr.
diff --git a/bfd/elfcore.h b/bfd/elfcore.h
index 4f9fcf7..724d607 100644
--- a/bfd/elfcore.h
+++ b/bfd/elfcore.h
@@ -1,22 +1,22 @@
 /* ELF core file support for BFD.
-   Copyright 1995, 1996, 1997, 1998, 2000, 2001, 2002
+   Copyright 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 char*
 elf_core_file_failing_command (abfd)
@@ -48,11 +48,11 @@ elf_core_file_matches_executable_p (core_bfd, exec_bfd)
     }
 
   /* See if the name in the corefile matches the executable name.  */
-
   corename = elf_tdata (core_bfd)->core_program;
   if (corename != NULL)
     {
       const char* execname = strrchr (exec_bfd->filename, '/');
+
       execname = execname ? execname + 1 : exec_bfd->filename;
 
       if (strcmp(execname, corename) != 0)
@@ -71,17 +71,15 @@ elf_core_file_matches_executable_p (core_bfd, exec_bfd)
     register set) and the floating point register set are stored in a
     segment of type PT_NOTE.  We handcraft a couple of extra bfd sections
     that allow standard bfd access to the general registers (.reg) and the
-    floating point registers (.reg2).
-
- */
+    floating point registers (.reg2).  */
 
 const bfd_target *
 elf_core_file_p (abfd)
      bfd *abfd;
 {
-  Elf_External_Ehdr x_ehdr;	/* Elf file header, external form */
-  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form */
-  Elf_Internal_Phdr *i_phdrp;	/* Elf program header, internal form */
+  Elf_External_Ehdr x_ehdr;	/* Elf file header, external form.  */
+  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form.  */
+  Elf_Internal_Phdr *i_phdrp;	/* Elf program header, internal form.  */
   unsigned int phindex;
   struct elf_backend_data *ebd;
   struct bfd_preserve preserve;
@@ -103,7 +101,7 @@ elf_core_file_p (abfd)
   if (! elf_file_p (&x_ehdr))
     goto wrong;
 
-  /* FIXME: Check EI_VERSION here ! */
+  /* FIXME: Check EI_VERSION here !  */
 
   /* Check the address size ("class").  */
   if (x_ehdr.e_ident[EI_CLASS] != ELFCLASS)
@@ -112,11 +110,11 @@ elf_core_file_p (abfd)
   /* Check the byteorder.  */
   switch (x_ehdr.e_ident[EI_DATA])
     {
-    case ELFDATA2MSB:		/* Big-endian */
+    case ELFDATA2MSB:		/* Big-endian.  */
       if (! bfd_big_endian (abfd))
 	goto wrong;
       break;
-    case ELFDATA2LSB:		/* Little-endian */
+    case ELFDATA2LSB:		/* Little-endian.  */
       if (! bfd_little_endian (abfd))
 	goto wrong;
       break;
@@ -168,7 +166,11 @@ elf_core_file_p (abfd)
 	  if ((*target_ptr)->flavour != bfd_target_elf_flavour)
 	    continue;
 	  back = (struct elf_backend_data *) (*target_ptr)->backend_data;
-	  if (back->elf_machine_code == i_ehdrp->e_machine)
+	  if (back->elf_machine_code == i_ehdrp->e_machine
+	      || (back->elf_machine_alt1 != 0
+	          && i_ehdrp->e_machine == back->elf_machine_alt1)
+	      || (back->elf_machine_alt2 != 0
+	          && i_ehdrp->e_machine == back->elf_machine_alt2))
 	    {
 	      /* target_ptr is an ELF backend which matches this
 		 object file, so reject the generic ELF target.  */
@@ -203,6 +205,7 @@ elf_core_file_p (abfd)
   for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
     {
       Elf_External_Phdr x_phdr;
+
       if (bfd_bread ((PTR) &x_phdr, (bfd_size_type) sizeof (x_phdr), abfd)
 	  != sizeof (x_phdr))
 	goto fail;
@@ -222,21 +225,17 @@ elf_core_file_p (abfd)
 
   /* Process each program header.  */
   for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
-    {
-      if (! bfd_section_from_phdr (abfd, i_phdrp + phindex, (int) phindex))
-	goto fail;
-    }
+    if (! bfd_section_from_phdr (abfd, i_phdrp + phindex, (int) phindex))
+      goto fail;
 
   /* Save the entry point from the ELF header.  */
   bfd_get_start_address (abfd) = i_ehdrp->e_entry;
 
   /* Let the backend double check the format and override global
      information.  */
-  if (ebd->elf_backend_object_p)
-    {
-      if (! (*ebd->elf_backend_object_p) (abfd))
-	goto wrong;
-    }
+  if (ebd->elf_backend_object_p
+      && (! (*ebd->elf_backend_object_p) (abfd)))
+    goto wrong;
 
   bfd_preserve_finish (abfd, &preserve);
   return abfd->xvec;