From 51538c494bfee7fe35886dbca4ee02a8a1f4f561 Mon Sep 17 00:00:00 2001 From: amylaar Date: Fri, 12 Nov 2010 20:07:34 +0000 Subject: [PATCH] PR target/46438 * config/xtensa/xtensa.c (xtensa_expand_nonlocal_goto): Use LCT_NORMAL. (xtensa_setup_frame_addresses, xtensa_trampoline_init): Likewise. (xtensa_function_arg_1): De-constify cum. (xtensa_expand_prologue): Use add_reg_note. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166672 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/config/xtensa/xtensa.c | 11 +++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5b109eb..0b7f92a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-11-12 Joern Rennecke + + PR target/46438 + * config/xtensa/xtensa.c (xtensa_expand_nonlocal_goto): Use LCT_NORMAL. + (xtensa_setup_frame_addresses, xtensa_trampoline_init): Likewise. + (xtensa_function_arg_1): De-constify cum. + (xtensa_expand_prologue): Use add_reg_note. + 2010-11-12 Eric Botcazou * function.c (expand_function_end): Set the locator of the prologue on diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c index 033779c..4abe2ae 100644 --- a/gcc/config/xtensa/xtensa.c +++ b/gcc/config/xtensa/xtensa.c @@ -1305,7 +1305,7 @@ xtensa_expand_nonlocal_goto (rtx *operands) containing_fp = force_reg (Pmode, containing_fp); emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__xtensa_nonlocal_goto"), - 0, VOIDmode, 2, + LCT_NORMAL, VOIDmode, 2, containing_fp, Pmode, goto_handler, Pmode); } @@ -1583,7 +1583,7 @@ xtensa_setup_frame_addresses (void) emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__xtensa_libgcc_window_spill"), - 0, VOIDmode, 0); + LCT_NORMAL, VOIDmode, 0); } @@ -2043,7 +2043,7 @@ xtensa_function_arg_advance (CUMULATIVE_ARGS *cum, enum machine_mode mode, if this is an incoming argument to the current function. */ static rtx -xtensa_function_arg_1 (const CUMULATIVE_ARGS *cum, enum machine_mode mode, +xtensa_function_arg_1 (CUMULATIVE_ARGS *cum, enum machine_mode mode, const_tree type, bool incoming_p) { int regbase, words, max; @@ -2637,8 +2637,7 @@ xtensa_expand_prologue (void) : stack_pointer_rtx), plus_constant (stack_pointer_rtx, -total_size)); RTX_FRAME_RELATED_P (insn) = 1; - REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR, - note_rtx, REG_NOTES (insn)); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); } @@ -3590,7 +3589,7 @@ xtensa_trampoline_init (rtx m_tramp, tree fndecl, rtx chain) emit_move_insn (adjust_address (m_tramp, SImode, chain_off), chain); emit_move_insn (adjust_address (m_tramp, SImode, func_off), func); emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__xtensa_sync_caches"), - 0, VOIDmode, 1, XEXP (m_tramp, 0), Pmode); + LCT_NORMAL, VOIDmode, 1, XEXP (m_tramp, 0), Pmode); } -- 2.7.4