PR target/60568

	* config/i386/i386.c (x86_output_mi_thunk): Surround UNSPEC_GOT
	into CONST, put pic register as first operand of PLUS.  Use
	gen_const_mem for both 32-bit and 64-bit PIC got loads.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@208717 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a517bde..08484ca 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-20  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/60568
+       * config/i386/i386.c (x86_output_mi_thunk): Surround UNSPEC_GOT
+       into CONST, put pic register as first operand of PLUS.  Use
+       gen_const_mem for both 32-bit and 64-bit PIC got loads.
+
 2014-03-19  Eric Botcazou  <ebotcazou@adacore.com>
 
        * tree-dfa.c (get_ref_base_and_extent) <ARRAY_REF>: Remove space.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 8bbf5d0..9116dd4 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -32406,7 +32406,7 @@ x86_output_mi_thunk (FILE *file,
        {
          tmp = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, fnaddr), UNSPEC_GOTPCREL);
          tmp = gen_rtx_CONST (Pmode, tmp);
-         fnaddr = gen_rtx_MEM (Pmode, tmp);
+         fnaddr = gen_const_mem (Pmode, tmp);
        }
     }
   else
@@ -32426,8 +32426,9 @@ x86_output_mi_thunk (FILE *file,
          output_set_got (tmp, NULL_RTX);
 
          fnaddr = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, fnaddr), UNSPEC_GOT);
-         fnaddr = gen_rtx_PLUS (Pmode, fnaddr, tmp);
-         fnaddr = gen_rtx_MEM (Pmode, fnaddr);
+         fnaddr = gen_rtx_CONST (Pmode, fnaddr);
+         fnaddr = gen_rtx_PLUS (Pmode, tmp, fnaddr);
+         fnaddr = gen_const_mem (Pmode, fnaddr);
        }
     }