--- gcc-4.1.2/gcc/config/arm/cirrus.md-original	2007-06-28 12:04:15.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/cirrus.md	2007-06-28 12:21:57.000000000 +1000
@@ -436,30 +436,28 @@
 )
 
 (define_insn "*cirrus_movsf_hard_insn"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=v,v,v,r,m,r,r,m")
-        (match_operand:SF 1 "general_operand"      "v,mE,r,v,v,r,mE,r"))]
+  [(set (match_operand:SF 0 "nonimmediate_operand" "=v,v,r,r,r,m")
+        (match_operand:SF 1 "general_operand"      "v,r,v,r,mE,r"))]
   "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK
    && (GET_CODE (operands[0]) != MEM
        || register_operand (operands[1], SFmode))"
   "@
    cfcpys%?\\t%V0, %V1
-   cfldrs%?\\t%V0, %1
    cfmvsr%?\\t%V0, %1
    cfmvrs%?\\t%0, %V1
-   cfstrs%?\\t%V1, %0
    mov%?\\t%0, %1
    ldr%?\\t%0, %1\\t%@ float
    str%?\\t%1, %0\\t%@ float"
-  [(set_attr "length"         "     *,     *,   *,     *,     *,  4,   4,     4")
-   (set_attr "type"           "     *,  load1,   *,     *,store1,  *,load1,store1")
-   (set_attr "pool_range"     "     *,   1020,   *,     *,     *,  *,4096,     *")
-   (set_attr "neg_pool_range" "     *,   1008,   *,     *,     *,  *,4084,     *")
-   (set_attr "cirrus"         "normal,normal,move,normal,normal,not, not,   not")]
+  [(set_attr "length"         "     *,   *,     *,  4,   4,     4")
+   (set_attr "type"           "     *,   *,     *,  *,load1,store1")
+   (set_attr "pool_range"     "     *,   *,     *,  *,4096,     *")
+   (set_attr "neg_pool_range" "     *,   *,     *,  *,4084,     *")
+   (set_attr "cirrus"         "normal,move,normal,not, not,   not")]
 )
 
 (define_insn "*cirrus_movdf_hard_insn"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=r,Q,r,m,r,v,v,v,r,m")
-	(match_operand:DF 1 "general_operand"       "Q,r,r,r,mF,v,mF,r,v,v"))]
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=r,Q,r,m,r,v,v,r,m")
+	(match_operand:DF 1 "general_operand"       "Q,r,r,r,mF,v,r,v,v"))]
   "TARGET_ARM
    && TARGET_HARD_FLOAT && TARGET_MAVERICK
    && (GET_CODE (operands[0]) != MEM
@@ -473,17 +471,15 @@
     case 2: return \"#\";
     case 3: case 4: return output_move_double (operands);
     case 5: return \"cfcpyd%?\\t%V0, %V1\";
-    case 6: return \"cfldrd%?\\t%V0, %1\";
-    case 7: return \"cfmvdlr\\t%V0, %Q1\;cfmvdhr%?\\t%V0, %R1\";
-    case 8: return \"cfmvrdl%?\\t%Q0, %V1\;cfmvrdh%?\\t%R0, %V1\";
-    case 9: return \"cfstrd%?\\t%V1, %0\";
+    case 6: return \"cfmvdlr\\t%V0, %Q1\;cfmvdhr%?\\t%V0, %R1\";
+    case 7: return \"cfmvrdl%?\\t%Q0, %V1\;cfmvrdh%?\\t%R0, %V1\";
     default: gcc_unreachable ();
     }
   }"
-  [(set_attr "type"           "load1,store2,  *,store2,load1,     *,  load1,   *,     *,store2")
-   (set_attr "length"         "   4,     4,  8,     8,   8,     4,     4,   8,     8,     4")
-   (set_attr "pool_range"     "   *,     *,  *,     *, 252,     *,  1020,   *,     *,     *")
-   (set_attr "neg_pool_range" "   *,     *,  *,     *, 244,     *,  1008,   *,     *,     *")
-   (set_attr "cirrus"         " not,   not,not,   not, not,normal,double,move,normal,double")]
+  [(set_attr "type"           "load1,store2,  *,store2,load1,   *,  *,     *")
+   (set_attr "length"         "   4,     4,  8,     8,   8,     4,  8,     8")
+   (set_attr "pool_range"     "   *,     *,  *,     *, 252,     *,  *,     *")
+   (set_attr "neg_pool_range" "   *,     *,  *,     *, 244,     *,  *,     *")
+   (set_attr "cirrus"         " not,   not,not,   not, not,normal,move,normal")]
 )