Fix -fpic -a problems.

From-SVN: r8315

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index c11aaa22e7c3c6a301860a455be8713c8fe3bd27..a5623a7d87d80e7d1725f7d5e4102c3c8a8d4afe 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -972,9 +972,15 @@ do                                                                 \
                                                                        \
     ASM_GENERATE_INTERNAL_LABEL (counts, "LPBX", 2);                   \
     cnt_rtx = gen_rtx (SYMBOL_REF, VOIDmode, counts);                  \
-    CONSTANT_POOL_ADDRESS_P (cnt_rtx) = TRUE;                          \
+    SYMBOL_REF_FLAG (cnt_rtx) = TRUE;                                  \
                                                                        \
-    xops[0] = gen_rtx (MEM, SImode, plus_constant (cnt_rtx, (BLOCKNO)*4)); \
+    if (BLOCKNO)                                                       \
+      cnt_rtx = plus_constant (cnt_rtx, (BLOCKNO)*4);                  \
+                                                                       \
+    if (flag_pic)                                                      \
+      cnt_rtx = gen_rtx (PLUS, Pmode, pic_offset_table_rtx, cnt_rtx);  \
+                                                                       \
+    xops[0] = gen_rtx (MEM, SImode, cnt_rtx);                          \
     output_asm_insn (AS1(inc%L0,%0), xops);                            \
   }                                                                    \
 while (0)