diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 8eee44756eb..99f38249714 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -21512,11 +21512,12 @@
    (set_attr "mode" "SI")])
 
 ; As bsr is undefined behavior on zero and for other input
-; values it is in range 0 to 63, we can optimize away sign-extends.
-(define_insn_and_split "*bsr_rex64_2"
+; values it is in range 0 to 63, we can optimize away sign-extends
+; or zero-extends.
+(define_insn_and_split "*bsr_rex64<u>_2"
   [(set (match_operand:DI 0 "register_operand")
 	(xor:DI
-	  (sign_extend:DI
+	  (any_extend:DI
 	    (minus:SI
 	      (const_int 63)
 	      (subreg:SI (clz:DI (match_operand:DI 1 "nonimmediate_operand"))
@@ -21538,9 +21539,9 @@
   operands[3] = lowpart_subreg (SImode, operands[2], DImode);
 })
 
-(define_insn_and_split "*bsr_2"
+(define_insn_and_split "*bsr<u>_2"
   [(set (match_operand:DI 0 "register_operand")
-	(sign_extend:DI
+	(any_extend:DI
 	  (xor:SI
 	    (minus:SI
 	      (const_int 31)
@@ -21617,7 +21618,7 @@
 	(minus:DI
 	  (match_operand:DI 2 "const_int_operand")
 	  (xor:DI
-	    (sign_extend:DI
+	    (any_extend:DI
 	      (minus:SI (const_int 63)
 			(subreg:SI
 			  (clz:DI (match_operand:DI 1 "nonimmediate_operand"))
@@ -21647,7 +21648,7 @@
   [(set (match_operand:DI 0 "register_operand")
 	(minus:DI
 	  (match_operand:DI 2 "const_int_operand")
-	  (sign_extend:DI
+	  (any_extend:DI
 	    (xor:SI
 	      (minus:SI (const_int 31)
 			(clz:SI (match_operand:SI 1 "nonimmediate_operand")))