From patchwork Fri Nov 12 20:11:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joern Rennecke X-Patchwork-Id: 71011 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 5F643B7118 for ; Sat, 13 Nov 2010 07:10:38 +1100 (EST) Received: (qmail 2065 invoked by alias); 12 Nov 2010 20:10:34 -0000 Received: (qmail 2049 invoked by uid 22791); 12 Nov 2010 20:10:33 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from c60.cesmail.net (HELO c60.cesmail.net) (216.154.195.49) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 12 Nov 2010 20:10:28 +0000 Received: from unknown (HELO webmail2) ([192.168.1.183]) by c60.cesmail.net with ESMTP; 12 Nov 2010 15:10:26 -0500 Received: from 89.241.153.155 ([89.241.153.155]) by webmail.spamcop.net (Horde MIME library) with HTTP; Fri, 12 Nov 2010 15:11:14 -0500 Message-ID: <20101112151114.m1erp71q80ckk4gs-nzlynne@webmail.spamcop.net> Date: Fri, 12 Nov 2010 15:11:14 -0500 From: Joern Rennecke To: gcc-patches@gcc.gnu.org Cc: sterling@tensilica.com Subject: Committed: Fix xtensa --enable-werror-always build MIME-Version: 1.0 User-Agent: Internet Messaging Program (IMP) H3 (4.1.4) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Built on i686-pc-linux-gnu with gcc (GCC) 4.6.0 20101111 (experimental) . Committed as obvious. 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. Index: config/xtensa/xtensa.c =================================================================== --- config/xtensa/xtensa.c (revision 166609) +++ config/xtensa/xtensa.c (working copy) @@ -1305,7 +1305,7 @@ xtensa_expand_nonlocal_goto (rtx *operan 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_ 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, tre 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); }