diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 207a19fd5d5..32fe0f004d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-24  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+	* tree-ssa-ifcombine.c (ifcombine_ifandif): Use a ONE operand
+	with the mode of the original operand instead of
+	integer_one_node.
+
 2007-07-23  Jan Hubicka  <jH@suse.cz>
 
 	* i386.c (ix86_secondary_memory_needed): Break out to...
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index 9486e54281d..5da544c2100 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -313,9 +313,9 @@ ifcombine_ifandif (basic_block inner_cond_bb, basic_block outer_cond_bb)
       /* Do it.  */
       bsi = bsi_for_stmt (inner_cond);
       t = fold_build2 (LSHIFT_EXPR, TREE_TYPE (name1),
-		       integer_one_node, bit1);
+		       build_int_cst (TREE_TYPE (name1), 1), bit1);
       t2 = fold_build2 (LSHIFT_EXPR, TREE_TYPE (name1),
-		        integer_one_node, bit2);
+		        build_int_cst (TREE_TYPE (name1), 1), bit2);
       t = fold_build2 (BIT_IOR_EXPR, TREE_TYPE (name1), t, t2);
       t = force_gimple_operand_bsi (&bsi, t, true, NULL_TREE,
 				    true, BSI_SAME_STMT);