(elf64_hppa_object_p): Set architecture and machine from elf header flags.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e9b87105d20a01e1a9f6a7f73b165dec7324f506..6330a85c1d0aa80b917659f64c37240f64f1ced6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -2,6 +2,8 @@
 
        * elf64-hppa.c (elf64_hppa_elf_get_symbol_type): New function.
        (elf_backend_get_symbol_type): Define.
+       (elf64_hppa_object_p): Set architecture and machine from elf
+       header flags.
 
 2001-01-30  Curtis L. Janssen  <cljanss@ca.sandia.gov>
 

diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c
index 7aa4e1864a5a772b363284ece5dd252ba75d4edb..1b3a548b72c0181988d58ae43d65cab27f3606bb 100644 (file)
--- a/bfd/elf64-hppa.c
+++ b/bfd/elf64-hppa.c
@@ -358,8 +358,21 @@ static boolean
 elf64_hppa_object_p (abfd)
      bfd *abfd;
 {
-  /* Set the right machine number for an HPPA ELF file.  */
-  return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 25);
+  unsigned int flags = elf_elfheader (abfd)->e_flags;
+
+  switch (flags & (EF_PARISC_ARCH | EF_PARISC_WIDE))
+    {
+    case EFA_PARISC_1_0:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 10);
+    case EFA_PARISC_1_1:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 11);
+    case EFA_PARISC_2_0:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 20);
+    case EFA_PARISC_2_0 | EF_PARISC_WIDE:
+      return bfd_default_set_arch_mach (abfd, bfd_arch_hppa, 25);
+    }
+  /* Don't be fussy.  */
+  return true;
 }
 
 /* Given section type (hdr->sh_type), return a boolean indicating