diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 055832b5103..f240c15c2f3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-07  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/predicates.md (x86_64_zext_general_operand): New.
+	* config/i386/i386.md (*zero_extendsidi2_rex64): Change operand 1
+	predicate to x86_64_zext_general_operand.  Accept "Z" constraint.
+
 2012-03-07  Walter Lee  <walt@tilera.com>
 
 	* config/tilegx/tilegx.c (tilegx_expand_prologue): Don't generate
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index f000cc6a271..a67a5e715c1 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -3377,10 +3377,10 @@
 
 (define_insn "*zero_extendsidi2_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand"
-			"=r,o,?*Ym,?*y,?*Yi,!*x")
+			"=r ,o,?*Ym,?*y,?*Yi,!*x")
 	(zero_extend:DI
-	 (match_operand:SI 1 "nonimmediate_operand"
-	        	"rm,0,r   ,m  ,r   ,m*x")))]
+	 (match_operand:SI 1 "x86_64_zext_general_operand"
+	        	"rmZ,0,r   ,m  ,r   ,m*x")))]
   "TARGET_64BIT"
   "@
    mov{l}\t{%1, %k0|%k0, %1}
diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
index 32f73dacdd8..402e79acc37 100644
--- a/gcc/config/i386/predicates.md
+++ b/gcc/config/i386/predicates.md
@@ -340,6 +340,14 @@
 	 (match_operand 0 "x86_64_immediate_operand"))
     (match_operand 0 "general_operand")))
 
+;; Return true if OP is general operand representable on x86_64
+;; as zero extended constant.
+(define_predicate "x86_64_zext_general_operand"
+  (if_then_else (match_test "TARGET_64BIT")
+    (ior (match_operand 0 "nonimmediate_operand")
+	 (match_operand 0 "x86_64_zext_immediate_operand"))
+    (match_operand 0 "general_operand")))
+
 ;; Return true if OP is general operand representable on x86_64
 ;; as either sign extended or zero extended constant.
 (define_predicate "x86_64_szext_general_operand"