diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bdcd51dc829..2684bec6faa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-22  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.md: Use {} around multi-line preparation statements.
+
 2010-04-22  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
 
 	* c-tree.h (push_init_level, pop_init_level, set_init_index)
@@ -129,14 +133,12 @@
 	* dwarf2out.c (add_var_loc_to_decl): Add LABEL argument.  Drop
 	last chain entry if it starts with the still current label.
 	(add_location_or_const_value_attribute): Check that
-	loc_list->first->next is NULL instead of comparing ->first with
-	->last.
+	loc_list->first->next is NULL instead of comparing ->first with ->last.
 	(dwarf2out_var_location): Pass last_label resp. last_postcall_label
 	to add_var_loc_to_decl.
 
 	* dwarf2out.c (output_call_frame_info): For dw_cie_version
-	>= 4 add also address size and segment size fields into CIE
-	header.
+	>= 4 add also address size and segment size fields into CIE header.
 
 	* unwind-dw2.c (extract_cie_info): Handle CIE version 4, as
 	long as address size is the same as sizeof (void *) and
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 1e06ca017c6..8249efd31fd 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -2380,11 +2380,13 @@
    && !x86_64_immediate_operand (operands[1], DImode) && 1"
   [(set (match_dup 0) (match_dup 1))
    (set (match_dup 2) (match_dup 3))]
-  "split_di (&operands[1], 1, &operands[2], &operands[3]);
-   operands[1] = gen_lowpart (DImode, operands[2]);
-   operands[2] = gen_rtx_MEM (SImode, gen_rtx_PLUS (DImode, stack_pointer_rtx,
-						    GEN_INT (4)));
-  ")
+{
+  split_di (&operands[1], 1, &operands[2], &operands[3]);
+
+  operands[1] = gen_lowpart (DImode, operands[2]);
+  operands[2] = gen_rtx_MEM (SImode, gen_rtx_PLUS (DImode, stack_pointer_rtx,
+						   GEN_INT (4)));
+})
 
 (define_split
   [(set (match_operand:DI 0 "push_operand" "")
@@ -2395,11 +2397,13 @@
    && !x86_64_immediate_operand (operands[1], DImode)"
   [(set (match_dup 0) (match_dup 1))
    (set (match_dup 2) (match_dup 3))]
-  "split_di (&operands[1], 1, &operands[2], &operands[3]);
-   operands[1] = gen_lowpart (DImode, operands[2]);
-   operands[2] = gen_rtx_MEM (SImode, gen_rtx_PLUS (DImode, stack_pointer_rtx,
-						    GEN_INT (4)));
-  ")
+{
+  split_di (&operands[1], 1, &operands[2], &operands[3]);
+
+  operands[1] = gen_lowpart (DImode, operands[2]);
+  operands[2] = gen_rtx_MEM (SImode, gen_rtx_PLUS (DImode, stack_pointer_rtx,
+						   GEN_INT (4)));
+})
 
 (define_insn "*pushdi2_prologue_rex64"
   [(set (match_operand:DI 0 "push_operand" "=<")
@@ -11535,6 +11539,7 @@
   [(const_int 0)]
 {
   operands[7] = gen_rtx_FLOAT (GET_MODE (operands[1]), operands[2]);
+
   ix86_split_fp_branch (swap_condition (GET_CODE (operands[0])),
 			operands[3], operands[7],
 			operands[4], operands[5], operands[6], NULL_RTX);
@@ -11558,6 +11563,7 @@
 {
   operands[7] = ix86_force_to_memory (GET_MODE (operands[2]), operands[2]);
   operands[7] = gen_rtx_FLOAT (GET_MODE (operands[1]), operands[7]);
+
   ix86_split_fp_branch (swap_condition (GET_CODE (operands[0])),
 			operands[3], operands[7],
 			operands[4], operands[5], operands[6], operands[2]);
@@ -16660,8 +16666,10 @@
 	(if_then_else:SI (match_op_dup 1 [(match_dup 4) (const_int 0)])
 		      (match_dup 7)
 		      (match_dup 8)))]
-  "split_di (&operands[2], 2, &operands[5], &operands[7]);
-   split_di (&operands[0], 1, &operands[2], &operands[3]);")
+{
+  split_di (&operands[2], 2, &operands[5], &operands[7]);
+  split_di (&operands[0], 1, &operands[2], &operands[3]);
+})
 
 (define_insn "*movxfcc_1"
   [(set (match_operand:XF 0 "register_operand" "=f,f")