From 0aae659fe2d615bccaf98fedc78b0a855735c7fc Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 20 Mar 2014 17:34:32 +0100 Subject: [PATCH] re PR target/60568 (lto1: internal compiler error: in insn_min_length, at config/i386/i386.md:1599) 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. From-SVN: r208717 --- gcc/ChangeLog | 7 +++++++ gcc/config/i386/i386.c | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a517bdebd036..08484ca96d04 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-03-20 Jakub Jelinek + + 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 * tree-dfa.c (get_ref_base_and_extent) : Remove space. diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 8bbf5d0484bc..9116dd4c63f1 100644 --- 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); } } -- 2.47.2