From a3bfe8fd89bfaa4b9b4f14171b5f4fcc00c0bc54 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sat, 19 Jun 2004 07:29:04 +0000 Subject: [PATCH] Merge FSF GCC rev 1.579 change ((x86_output_mi_thunk): Don't pass MEM to %P0, just SYMBOL_REF) into GCC 3.3.3. This fixes the bad C++ thunks code generation building Firefox on AMD64. Submitted by: Sean McNeil --- contrib/gcc/config/i386/i386.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/gcc/config/i386/i386.c b/contrib/gcc/config/i386/i386.c index 11acaf22916..9f00dd5702c 100644 --- a/contrib/gcc/config/i386/i386.c +++ b/contrib/gcc/config/i386/i386.c @@ -14607,15 +14607,14 @@ x86_output_mi_thunk (file, thunk, delta, vcall_offset, function) output_asm_insn ("mov{l}\t{%0, %1|%1, %0}", xops); } - xops[0] = DECL_RTL (function); + xops[0] = XEXP (DECL_RTL (function), 0); if (TARGET_64BIT) { if (!flag_pic || (*targetm.binds_local_p) (function)) output_asm_insn ("jmp\t%P0", xops); else { - tmp = XEXP (xops[0], 0); - tmp = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, tmp), UNSPEC_GOTPCREL); + tmp = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, xops[0]), UNSPEC_GOTPCREL); tmp = gen_rtx_CONST (Pmode, tmp); tmp = gen_rtx_MEM (QImode, tmp); xops[0] = tmp;