diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 875403aa2a6e..e648f376895c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-16  Jeff Law <law@redhat.com>
+
+	* toplev.c (rest_of_compilation): Perform a simpler, less costly
+	cleanup of the CFG when not optimizing.
+
 2002-06-16  Alan Modra  <amodra@bigpond.net.au>
 
 	* gcc.c (main): Correct startfile_prefix_spec check.
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 7965059f37f6..7c1e0d68d6d7 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -2720,7 +2720,7 @@ rest_of_compilation (decl)
     }
 
   timevar_push (TV_JUMP);
-  cleanup_cfg (CLEANUP_EXPENSIVE | CLEANUP_PRE_LOOP);
+  cleanup_cfg (optimize ? CLEANUP_EXPENSIVE | CLEANUP_PRE_LOOP: 0);
 
   /* Try to identify useless null pointer tests and delete them.  */
   if (flag_delete_null_pointer_checks)