diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 39401e110b9..1eb36ab0b37 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 Thu Feb 15 21:30:26 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
+	* flow.c (tidy_fallthru_edge): Never end block on line number NOTE.
+
 	* function.c (assign_parms): Set RTX_UNCHANGING_P in pseudo when we
 	do in memory.
 
diff --git a/gcc/flow.c b/gcc/flow.c
index d22540e2801..a3cc477d994 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -2814,7 +2814,14 @@ tidy_fallthru_edge (e, b, c)
 	  NOTE_SOURCE_FILE (q) = 0;
 	}
       else
-	q = PREV_INSN (q);
+	{
+	  q = PREV_INSN (q);
+
+	  /* We don't want a block to end on a line-number note since that has
+	     the potential of changing the code between -g and not -g.  */
+	  while (GET_CODE (q) == NOTE && NOTE_LINE_NUMBER (q) >= 0)
+	    q = PREV_INSN (q);
+	}
 
       b->end = q;
     }