From 3a5e4ad6e2e1293c707721525f896542571d8d85 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 12 Jul 2011 11:20:29 -0700 Subject: [PATCH] re PR target/49714 (Revision 176128 introduced many ICEs in insn_default_length, at config/i386/i386.md:600) PR target/49714 * config/i386/i386.c (x86_output_mi_thunk): Use machopic_indirect_call_target instead of machopic_indirection_name directly. From-SVN: r176211 --- gcc/ChangeLog | 7 +++++++ gcc/config/i386/i386.c | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cb1a354afab..c55a6aeeb82 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-07-12 Richard Henderson + + PR target/49714 + * config/i386/i386.c (x86_output_mi_thunk): Use + machopic_indirect_call_target instead of machopic_indirection_name + directly. + 2011-07-12 Laurent GUERBY Eric Botcazou diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index e75e1b1d35e..325d901cd30 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -29508,12 +29508,8 @@ x86_output_mi_thunk (FILE *file, #if TARGET_MACHO else if (TARGET_MACHO) { - rtx sym_ref = XEXP (DECL_RTL (function), 0); - if (TARGET_MACHO_BRANCH_ISLANDS) - sym_ref = (gen_rtx_SYMBOL_REF - (Pmode, - machopic_indirection_name (sym_ref, /*stub_p=*/true))); - fnaddr = gen_rtx_MEM (Pmode, sym_ref); + fnaddr = machopic_indirect_call_target (DECL_RTL (function)); + fnaddr = XEXP (fnaddr, 0); } #endif /* TARGET_MACHO */ else -- 2.30.2