diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b23954b5e7..e34b6980110 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-22  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* lra.c (lra): Remove call to recog_init.
+	* config/i386/i386.md (preferred_for_speed): New attribute
+	(*float<SWI48:mode><MODEF:mode>2_sse): Override it instead of
+	"enabled".  Remove check for sched1.
+
 2014-10-22  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* recog.h (recog_data_d): Remove enabled_alternatives.
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 624a1c1468b..7ba07c3ae7c 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -779,6 +779,8 @@
 	]
 	(const_int 1)))
 
+(define_attr "preferred_for_speed" "" (const_int 1))
+
 ;; Describe a user's asm statement.
 (define_asm_attributes
   [(set_attr "length" "128")
@@ -4794,16 +4796,12 @@
               (symbol_ref "TARGET_MIX_SSE_I387
                            && X87_ENABLE_FLOAT (<MODEF:MODE>mode,
                                                 <SWI48:MODE>mode)")
-            (eq_attr "alternative" "1")
-              /* ??? For sched1 we need constrain_operands to be able to
-                 select an alternative.  Leave this enabled before RA.  */
-              (symbol_ref "TARGET_INTER_UNIT_CONVERSIONS
-                           || optimize_function_for_size_p (cfun)
-                           || !(reload_completed
-                                || reload_in_progress
-                                || lra_in_progress)")
            ]
            (symbol_ref "true")))
+   (set (attr "preferred_for_speed")
+     (cond [(eq_attr "alternative" "1")
+              (symbol_ref "TARGET_INTER_UNIT_CONVERSIONS")]
+           (symbol_ref "true")))
    ])
 
 (define_insn "*float<SWI48x:mode><MODEF:mode>2_i387"
diff --git a/gcc/lra.c b/gcc/lra.c
index 22226361e64..dfca2df2291 100644
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -2120,11 +2120,6 @@ lra (FILE *f)
 
   lra_in_progress = 1;
 
-  /* The enable attributes can change their values as LRA starts
-     although it is a bad practice.  To prevent reuse of the outdated
-     values, clear them.  */
-  recog_init ();
-
   lra_live_range_iter = lra_coalesce_iter = lra_constraint_iter = 0;
   lra_assignment_iter = lra_assignment_iter_after_spill = 0;
   lra_inheritance_iter = lra_undo_inheritance_iter = 0;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 49e2537d51d..964037a1e96 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-22  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* gcc.target/i386/conversion-2.c: New test.
+
 2014-10-22  Jakub Jelinek  <jakub@redhat.com>
 	    Yury Gribov  <y.gribov@samsung.com>
 
diff --git a/gcc/testsuite/gcc.target/i386/conversion-2.c b/gcc/testsuite/gcc.target/i386/conversion-2.c
new file mode 100644
index 00000000000..cca149a6166
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/conversion-2.c
@@ -0,0 +1,36 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fno-toplevel-reorder -mtune=bdver2" } */
+/* { dg-additional-options "-mregparm=1 -msse -mfpmath=sse" { target ia32 } } */
+
+void __attribute__ ((hot))
+f1 (int x)
+{
+  register float f asm ("%xmm0") = x;
+  asm volatile ("" :: "x" (f));
+}
+
+void __attribute__ ((cold))
+f2 (int x)
+{
+  register float f asm ("%xmm1") = x;
+  asm volatile ("" :: "x" (f));
+}
+
+void __attribute__ ((hot))
+f3 (int x)
+{
+  register float f asm ("%xmm2") = x;
+  asm volatile ("" :: "x" (f));
+}
+
+void __attribute__ ((cold))
+f4 (int x)
+{
+  register float f asm ("%xmm3") = x;
+  asm volatile ("" :: "x" (f));
+}
+
+/* { dg-final { scan-assembler "sp\\\), %xmm0" } } */
+/* { dg-final { scan-assembler "(ax|di), %xmm1" } } */
+/* { dg-final { scan-assembler "sp\\\), %xmm2" } } */
+/* { dg-final { scan-assembler "(ax|di), %xmm3" } } */