[gcc] Fix optimized expand of ptr diff for 64-bit PIC

gcc/gcc/config/i386/i386.md

Index: gcc/gcc/config/i386/i386.md
diff --git a/gcc/gcc/config/i386/i386.md b/gcc/gcc/config/i386/i386.md
index 0f1407bde16f311f45371be991e8c0ca1bf7ae8a..3d1e33151d9133cee84c12a65ec3a92612f96283 100644
--- a/gcc/gcc/config/i386/i386.md
+++ b/gcc/gcc/config/i386/i386.md
@@ -866,7 +866,7 @@
 (define_insn "*cmpsi_minus_1"
   [(set (reg FLAGS_REG)
 	(compare (minus:SI (match_operand:SI 0 "nonimmediate_operand" "rm,r")
-			   (match_operand:SI 1 "general_operand" "ri,mr"))
+			   (match_operand:SI 1 "general_operand" "re,mr"))
 		 (const_int 0)))]
   "ix86_match_ccmode (insn, CCGOCmode)"
   "cmp{l}\t{%1, %0|%0, %1}"
@@ -883,7 +883,7 @@
 (define_insn "*cmpsi_1_insn"
   [(set (reg FLAGS_REG)
 	(compare (match_operand:SI 0 "nonimmediate_operand" "rm,r")
-		 (match_operand:SI 1 "general_operand" "ri,mr")))]
+		 (match_operand:SI 1 "general_operand" "re,mr")))]
   "!(MEM_P (operands[0]) && MEM_P (operands[1]))
     && ix86_match_ccmode (insn, CCmode)"
   "cmp{l}\t{%1, %0|%0, %1}"
@@ -7773,7 +7773,7 @@
 (define_insn "*subsi_1"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
 	(minus:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
-		  (match_operand:SI 2 "general_operand" "ri,rm")))
+		  (match_operand:SI 2 "general_operand" "re,rm")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (MINUS, SImode, operands)"
   "sub{l}\t{%2, %0|%0, %2}"