diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7c571ada98e..d61d6d24de7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2,8 +2,13 @@ Fri Jun 19 22:55:14 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* c-lang.c (GNU_xref_begin, GNU_xref_end): Deleted.
 
+	* Makefile.in (c-iterate.o): Depend on expr.h.
+
 Fri Jun 19 20:38:34 1998  H.J. Lu  (hjl@gnu.org)
 
+	* c-iterate.c: Include "expr.h".
+	(expand_expr): Use proper values when calling the function.
+
 	* explow.c (emit_stack_save): Add prototype for FCN.
 	(emit_stack_restore): Likewise.
 
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index c76a99076cb..24e29c05224 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1272,7 +1272,7 @@ c-convert.o : c-convert.c $(CONFIG_H) system.h $(TREE_H) flags.h toplev.h
 c-pragma.o: c-pragma.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) except.h \
     function.h defaults.h c-pragma.h toplev.h
 c-iterate.o: c-iterate.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) c-tree.h \
-    flags.h toplev.h 
+    flags.h toplev.h expr.h
 
 collect2$(exeext): collect2.o tlink.o hash.o cplus-dem.o underscore.o \
 	version.o choose-temp.o $(LIBDEPS)
diff --git a/gcc/c-iterate.c b/gcc/c-iterate.c
index 97235e89fe5..b8f51d090d6 100644
--- a/gcc/c-iterate.c
+++ b/gcc/c-iterate.c
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #include "obstack.h"
 #include "rtl.h"
 #include "toplev.h"
+#include "expr.h"
 
 /*
 		KEEPING TRACK OF EXPANSIONS
@@ -287,7 +288,8 @@ iterator_loop_prologue (idecl, start_note, end_note)
 
   /* Force the save_expr in DECL_INITIAL to be calculated
      if it hasn't been calculated yet.  */
-  expand_expr (DECL_INITIAL (idecl), const0_rtx, VOIDmode, 0);
+  expand_expr (DECL_INITIAL (idecl), const0_rtx, VOIDmode,
+	       EXPAND_NORMAL);
 
   if (DECL_RTL (idecl) == 0)
     expand_decl (idecl);
@@ -298,7 +300,7 @@ iterator_loop_prologue (idecl, start_note, end_note)
   /* Initialize counter.  */
   expr = build (MODIFY_EXPR, TREE_TYPE (idecl), idecl, integer_zero_node);
   TREE_SIDE_EFFECTS (expr) = 1;
-  expand_expr (expr, const0_rtx, VOIDmode, 0);
+  expand_expr (expr, const0_rtx, VOIDmode, EXPAND_NORMAL);
 
   expand_start_loop_continue_elsewhere (1);
 
@@ -339,7 +341,7 @@ iterator_loop_epilogue (idecl, start_note, end_note)
   incr = build_binary_op (PLUS_EXPR, idecl, integer_one_node, 0);
   incr = build (MODIFY_EXPR, TREE_TYPE (idecl), idecl, incr);
   TREE_SIDE_EFFECTS (incr) = 1;
-  expand_expr (incr, const0_rtx, VOIDmode, 0);
+  expand_expr (incr, const0_rtx, VOIDmode, EXPAND_NORMAL);
   test = build_binary_op (LT_EXPR, idecl, DECL_INITIAL (idecl), 0);
   expand_exit_loop_if_false (0, test);
   expand_end_loop ();