diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 95c0254d34..572cbca2a8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -5,6 +5,8 @@ Thu Sep 16 11:21:13 1999  Catherine Moore  <clm@cygnus.com>
 
 Thu Sep 16 10:48:17 1999  Jeffrey A Law  (law@cygnus.com)
 
+	* elf-hppa.h (elf_hppa_final_write_processing): Turn on TRAPNIL.
+
 	* elf-hppa.h (elf_hppa_final_link): If unable to find __gp in the
 	symbol table, then just compute a suitable value (but do not
 	create a __gp symbol).
diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h
index 900247ce3a..99cc17e51f 100644
--- a/bfd/elf-hppa.h
+++ b/bfd/elf-hppa.h
@@ -656,7 +656,13 @@ elf_hppa_final_write_processing (abfd, linker)
   else if (mach == 20)
     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;
+    elf_elfheader (abfd)->e_flags |= (EF_PARISC_WIDE
+				      | EFA_PARISC_2_0
+				      /* The GNU tools have trapped without
+					 option since 1993, so need to take
+					 a step backwards with the ELF
+					 based toolchains.  */
+				      | EF_PARISC_TRAPNIL);
 }
 
 /* Return true if SYM represents a local label symbol.  */