--- gcc-4.1.2/gcc/config/arm/arm.md-original	2007-06-13 17:16:38.000000000 +1000
+++ gcc-4.1.2/gcc/config/arm/arm.md	2007-06-13 17:35:19.000000000 +1000
@@ -8455,7 +8455,7 @@
 	(and:SI (match_operator:SI 1 "arm_comparison_operator"
 		 [(match_operand 3 "cc_register" "") (const_int 0)])
 		(match_operand:SI 2 "s_register_operand" "r")))]
-  "TARGET_ARM"
+  "TARGET_ARM && !TARGET_MAVERICK"
   "mov%D1\\t%0, #0\;and%d1\\t%0, %2, #1"
   [(set_attr "conds" "use")
    (set_attr "length" "8")]
@@ -8466,7 +8466,7 @@
 	(ior:SI (match_operator:SI 2 "arm_comparison_operator"
 		 [(match_operand 3 "cc_register" "") (const_int 0)])
 		(match_operand:SI 1 "s_register_operand" "0,?r")))]
-  "TARGET_ARM"
+  "TARGET_ARM && !TARGET_MAVERICK"
   "@
    orr%d2\\t%0, %1, #1
    mov%D2\\t%0, %1\;orr%d2\\t%0, %1, #1"
@@ -8734,7 +8734,8 @@
    (clobber (reg:CC CC_REGNUM))]
   "TARGET_ARM
    && (arm_select_dominance_cc_mode (operands[3], operands[6], DOM_CC_X_OR_Y)
-       != CCmode)"
+       != CCmode)
+   && !TARGET_MAVERICK"
   "#"
   "TARGET_ARM && reload_completed"
   [(set (match_dup 7)
@@ -8765,7 +8766,7 @@
    (set (match_operand:SI 7 "s_register_operand" "=r")
 	(ior:SI (match_op_dup 3 [(match_dup 1) (match_dup 2)])
 		(match_op_dup 6 [(match_dup 4) (match_dup 5)])))]
-  "TARGET_ARM"
+  "TARGET_ARM && !TARGET_MAVERICK"
   "#"
   "TARGET_ARM && reload_completed"
   [(set (match_dup 0)
@@ -8790,7 +8791,8 @@
    (clobber (reg:CC CC_REGNUM))]
   "TARGET_ARM
    && (arm_select_dominance_cc_mode (operands[3], operands[6], DOM_CC_X_AND_Y)
-       != CCmode)"
+       != CCmode)
+   && !TARGET_MAVERICK"
   "#"
   "TARGET_ARM && reload_completed
    && (arm_select_dominance_cc_mode (operands[3], operands[6], DOM_CC_X_AND_Y)
@@ -8823,7 +8825,7 @@
    (set (match_operand:SI 7 "s_register_operand" "=r")
 	(and:SI (match_op_dup 3 [(match_dup 1) (match_dup 2)])
 		(match_op_dup 6 [(match_dup 4) (match_dup 5)])))]
-  "TARGET_ARM"
+  "TARGET_ARM && !TARGET_MAVERICK"
   "#"
   "TARGET_ARM && reload_completed"
   [(set (match_dup 0)
@@ -8850,7 +8852,7 @@
 		 [(match_operand:SI 4 "s_register_operand" "r,r,r")
 		  (match_operand:SI 5 "arm_add_operand" "rIL,rIL,rIL")])))
    (clobber (reg:CC CC_REGNUM))]
-  "TARGET_ARM
+  "TARGET_ARM && !TARGET_MAVERICK
    && (arm_select_dominance_cc_mode (operands[3], operands[6], DOM_CC_X_AND_Y)
        == CCmode)"
   "#"