aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/i386/i386.c6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr65593.c4
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05174d8..0fb06d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-27 Jakub Jelinek <jakub@redhat.com>
+
+ PR target/65593
+ * config/i386/i386.c (legitimize_pic_address): If base
+ is SYMBOL_REF or LABEL_REF using %rip addressing, force
+ it to reg to avoid PLUS of SYMBOL_REF/LABEL_REF and register.
+
2015-03-27 Jan Hubicka <hubicka@ucw.cz>
PR target/65531
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 22bc81f..862bda5 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -13881,6 +13881,12 @@ legitimize_pic_address (rtx orig, rtx reg)
}
else
{
+ /* For %rip addressing, we have to use just disp32, not
+ base nor index. */
+ if (TARGET_64BIT
+ && (GET_CODE (base) == SYMBOL_REF
+ || GET_CODE (base) == LABEL_REF))
+ base = force_reg (mode, base);
if (GET_CODE (new_rtx) == PLUS
&& CONSTANT_P (XEXP (new_rtx, 1)))
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3409c96..4fb0e22 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-27 Jakub Jelinek <jakub@redhat.com>
+
+ PR target/65593
+ * gcc.c-torture/compile/pr65593.c: New test.
+
2015-03-27 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/59329
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr65593.c b/gcc/testsuite/gcc.c-torture/compile/pr65593.c
new file mode 100644
index 0000000..e72889d
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr65593.c
@@ -0,0 +1,4 @@
+/* PR target/65593 */
+/* { dg-additional-options "-fpie" { target pie } } */
+
+#include "pr20928.c"