diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7de42117ec0..63d1d21479d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-27  Geoffrey Keating  <geoffk@redhat.com>
+
+	* local-alloc.c (update_equiv_regs): Don't eliminate constant
+	expressions at -O0.
+
 2001-05-27  Stan Shebs  <shebs@apple.com>
 
 	* objc/objc-act.c: Add/fix various comments.
diff --git a/gcc/local-alloc.c b/gcc/local-alloc.c
index c83d4f145f5..13155f3a6b5 100644
--- a/gcc/local-alloc.c
+++ b/gcc/local-alloc.c
@@ -1005,7 +1005,7 @@ update_equiv_regs ()
 	  reg_equiv[regno].loop_depth = loop_depth;
 
 	  /* Don't mess with things live during setjmp.  */
-	  if (REG_LIVE_LENGTH (regno) >= 0)
+	  if (REG_LIVE_LENGTH (regno) >= 0 && optimize)
 	    {
 	      /* Note that the statement below does not affect the priority
 		 in local-alloc!  */