diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 07fe801232d615602b81a03b245c4d6fd90d4a9d..b73eac640788d1e095532f48c59ef467a8760395 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-19  Daniel Jacobowitz  <drow@mvista.com>
+
+	* expr.c (expand_expr): Use gen_int_mode for the argument
+	to gen_rtx_MULT.
+
 Wed Feb 19 14:22:42 CET 2003  Jan Hubicka  <jh@suse.cz>
 
 	* i386.md (cosxf2):  Fix conditional.
diff --git a/gcc/expr.c b/gcc/expr.c
index 601c5e991ab34f8bb1b21a8f89660b4fb1889c3b..926f10e488626b49010f4493f9d8a725e1bdde92 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -8089,6 +8089,8 @@ expand_expr (exp, target, tmode, modifier)
       if (modifier == EXPAND_SUM && mode == ptr_mode
 	  && host_integerp (TREE_OPERAND (exp, 1), 0))
 	{
+	  tree exp1 = TREE_OPERAND (exp, 1);
+
 	  op0 = expand_expr (TREE_OPERAND (exp, 0), subtarget, VOIDmode,
 			     EXPAND_SUM);
 
@@ -8107,9 +8109,9 @@ expand_expr (exp, target, tmode, modifier)
 	  if (GET_CODE (op0) != REG)
 	    op0 = copy_to_mode_reg (mode, op0);
 
-	  return
-	    gen_rtx_MULT (mode, op0,
-			  GEN_INT (tree_low_cst (TREE_OPERAND (exp, 1), 0)));
+	  return gen_rtx_MULT (mode, op0,
+			       gen_int_mode (tree_low_cst (exp1, 0),
+					     TYPE_MODE (TREE_TYPE (exp1))));
 	}
 
       if (! safe_from_p (subtarget, TREE_OPERAND (exp, 1), 1))