diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e35f8cfa28d..64280af6c59 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 11 11:37:58 2000  Mike Stump  <mrs@wrs.com>
+
+	* unroll.c (unroll_loop): Add EH support.
+
 2000-01-11  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* pa-protos.h: New file.
diff --git a/gcc/unroll.c b/gcc/unroll.c
index 01e5aee43aa..f5050c3b6d3 100644
--- a/gcc/unroll.c
+++ b/gcc/unroll.c
@@ -290,6 +290,19 @@ unroll_loop (loop_end, insn_count, loop_start, end_insert_before,
 		block_begins++;
 	      else if (NOTE_LINE_NUMBER (insn) == NOTE_INSN_BLOCK_END)
 		block_ends++;
+	      if (NOTE_LINE_NUMBER (insn) == NOTE_INSN_EH_REGION_BEG
+		  || NOTE_LINE_NUMBER (insn) == NOTE_INSN_EH_REGION_END)
+		{
+		  /* Note, would be nice to add code to unroll EH
+		     regions, but until that time, we punt (don't
+		     unroll).  For the proper way of doing it, see
+		     expand_inline_function.  */
+
+		  if (loop_dump_stream)
+		    fprintf (loop_dump_stream,
+			     "Unrolling failure: cannot unroll EH regions.\n");
+		  return;
+		}
 	    }
 	}