diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b5970c0a95..3c3e8a3ef8a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-28  Richard Henderson  <rth@redhat.com>
+
+	* cfgrtl.c (redirect_edge_and_branch): Abort if redirect_jump fails.
+
 2001-09-28  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* config/i386/sol2.h (CPLUSPLUS_CPP_SPEC): Define.
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 953ff80dc83..f5e678545b7 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -860,7 +860,10 @@ redirect_edge_and_branch (e, target)
       /* If the insn doesn't go where we think, we're confused.  */
       if (JUMP_LABEL (insn) != old_label)
 	abort ();
-      redirect_jump (insn, block_label (target), 0);
+      /* If the substitution doesn't succeed, die.  This can happen
+	 if the back end emitted unrecognizable instructions.  */
+      if (! redirect_jump (insn, block_label (target), 0))
+	abort ();
     }
 
   if (rtl_dump_file)