diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 49f1ee7..3b59024 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -2487,10 +2487,9 @@
     }
 }
   [(set (attr "type")
-     (if_then_else (and (match_operand:QI 0 "register_operand" "")
-			(ior (not (match_operand:QI 0 "q_regs_operand" ""))
-			     (ne (symbol_ref "TARGET_MOVX")
-				 (const_int 0))))
+     (if_then_else (ior (not (match_operand:QI 0 "QIreg_operand" ""))
+			(ne (symbol_ref "TARGET_MOVX")
+			    (const_int 0)))
 	(const_string "imovx")
 	(const_string "imov")))
    (set (attr "mode")
@@ -2514,10 +2513,9 @@
     }
 }
   [(set (attr "type")
-     (if_then_else (and (match_operand:QI 0 "register_operand" "")
-			(ior (not (match_operand:QI 0 "q_regs_operand" ""))
-			     (ne (symbol_ref "TARGET_MOVX")
-				 (const_int 0))))
+     (if_then_else (ior (not (match_operand:QI 0 "QIreg_operand" ""))
+			(ne (symbol_ref "TARGET_MOVX")
+			    (const_int 0)))
 	(const_string "imovx")
 	(const_string "imov")))
    (set (attr "mode")
@@ -2552,7 +2550,7 @@
     }
 }
   [(set (attr "type")
-     (if_then_else (ior (not (match_operand:QI 0 "q_regs_operand" ""))
+     (if_then_else (ior (not (match_operand:QI 0 "QIreg_operand" ""))
 			(ne (symbol_ref "TARGET_MOVX")
 			    (const_int 0)))
 	(const_string "imovx")
@@ -2579,10 +2577,9 @@
     }
 }
   [(set (attr "type")
-     (if_then_else (and (match_operand:QI 0 "register_operand" "")
-			(ior (not (match_operand:QI 0 "q_regs_operand" ""))
-			     (ne (symbol_ref "TARGET_MOVX")
-				 (const_int 0))))
+     (if_then_else (ior (not (match_operand:QI 0 "QIreg_operand" ""))
+			(ne (symbol_ref "TARGET_MOVX")
+			    (const_int 0)))
 	(const_string "imovx")
 	(const_string "imov")))
    (set (attr "mode")
diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
index 8a89f70..1471f5a 100644
--- a/gcc/config/i386/predicates.md
+++ b/gcc/config/i386/predicates.md
@@ -82,6 +82,10 @@
   (and (match_code "reg")
        (match_test "REGNO (op) == FLAGS_REG")))

+;; Return true if op is one of QImode registers: %[abcd][hl].
+(define_predicate "QIreg_operand"
+  (match_test "QI_REG_P (op)"))
+
 ;; Return true if op is a QImode register operand other than
 ;; %[abcd][hl].
 (define_predicate "ext_QIreg_operand"