diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 673dea47e0b6..6d3528e9f652 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -15,6 +15,10 @@
 	* expmed.c (expand_mult_const, expand_divmod): Likewise.
 	* reload1.c (gen_reload): Likewise.
 
+	* dse.c (get_stored_val, get_call_args): Use gen_int_mode.
+	* expmed.c (expand_divmod): Likewise.
+	* combine.c (simplify_if_then_else): Likewise.
+
 2011-12-09  Kai Tietz  <ktietz@redhat.com>
 
 	* ira-color.c (print_hard_regs_subforest): Use
diff --git a/gcc/combine.c b/gcc/combine.c
index 1714c749e16c..105e778edd9f 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -6010,7 +6010,7 @@ simplify_if_then_else (rtx x)
 	  && exact_log2 (nzb = nonzero_bits (from, GET_MODE (from))) >= 0)
 	{
 	  false_code = EQ;
-	  false_val = GEN_INT (trunc_int_for_mode (nzb, GET_MODE (from)));
+	  false_val = gen_int_mode (nzb, GET_MODE (from));
 	}
       else if (true_code == EQ && true_val == const0_rtx
 	       && (num_sign_bit_copies (from, GET_MODE (from))
diff --git a/gcc/dse.c b/gcc/dse.c
index 13d2f27ca237..c4207df08ec2 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -1950,7 +1950,7 @@ get_stored_val (store_info_t store_info, enum machine_mode read_mode,
 	      c |= (c << shift);
 	      shift <<= 1;
 	    }
-	  read_reg = GEN_INT (trunc_int_for_mode (c, store_mode));
+	  read_reg = gen_int_mode (c, store_mode);
 	  read_reg = extract_low_bits (read_mode, store_mode, read_reg);
 	}
     }
@@ -2459,7 +2459,7 @@ get_call_args (rtx call_insn, tree fn, rtx *args, int nargs)
 	{
 	  if (!tmp || !CONST_INT_P (tmp))
 	    return false;
-	  tmp = GEN_INT (trunc_int_for_mode (INTVAL (tmp), mode));
+	  tmp = gen_int_mode (INTVAL (tmp), mode);
 	}
       if (tmp)
 	args[idx] = tmp;
diff --git a/gcc/expmed.c b/gcc/expmed.c
index cfa045bf71e2..bced96e74d45 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -4216,10 +4216,9 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
 					<< (HOST_BITS_PER_WIDE_INT - 1)))
 			  set_dst_reg_note (insn, REG_EQUAL,
 					    gen_rtx_DIV (compute_mode, op0,
-							 GEN_INT
-							   (trunc_int_for_mode
-							     (abs_d,
-							      compute_mode))),
+							 gen_int_mode
+							   (abs_d,
+							    compute_mode)),
 					    quotient);
 
 			quotient = expand_unop (compute_mode, neg_optab,