* elf-hppa.h (elf_hppa_final_write_processing): Update for

        recent changes to the arch_info structure.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 228e30d0d84d4fd3675cacdb6ffa4ce9a7478b66..e75a82d24e300eb55bf423239ca871225e84a462 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,8 @@
 Tue Aug 10 12:48:09 1999  Jeffrey A Law  (law@cygnus.com)
 
+        * elf-hppa.h (elf_hppa_final_write_processing): Update for
+        recent changes to the arch_info structure.
+
        * elf-hppa.h (_bfd_elf_hppa_gen_reloc_type): Handle
        R_HPPA_SEGBASE and R_HPPA_SEGREL32.
        * cpu-hppa.c (bfd_hppa20w_arch): New entry in architecture info

diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h
index 44f22384cdb14fdf1059ca321c70f71ac9415f84..b046844cbcd298abc1cfbcd6b01c688a675cc9ca 100644 (file)
--- a/bfd/elf-hppa.h
+++ b/bfd/elf-hppa.h
@@ -606,13 +606,9 @@ elf_hppa_final_write_processing (abfd, linker)
   else if (mach == 11)
     elf_elfheader (abfd)->e_flags |= EFA_PARISC_1_1;
   else if (mach == 20)
-    {
-      elf_elfheader (abfd)->e_flags |= EFA_PARISC_2_0;
-#if ARCH_SIZE == 64
-      elf_elfheader (abfd)->e_flags |= EF_PARISC_WIDE;
-#endif
-    }
-
+    elf_elfheader (abfd)->e_flags |= EFA_PARISC_2_0;
+  else if (mach == 25)
+    elf_elfheader (abfd)->e_flags |= EF_PARISC_WIDE | EFA_PARISC_2_0;
 }
 
 /* Return true if SYM represents a local label symbol.  */