From patchwork Fri Feb 1 17:42:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Greenhalgh X-Patchwork-Id: 217549 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 3860C2C0086 for ; Sat, 2 Feb 2013 04:44:54 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1360345494; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=3uNI7MAhTAjnWMt4PcBnMkF90wk=; b=kS8K0DJOwyOTX9r R/q2DTK/9YASSLjStLcqVwrKKt4sF4aWo/TVijhhle8QyyHV89ovaXBARbLrRbp0 N2ky3/qTe74+v732UVZm5Ni6aQ7Epqd8qMa+qW9LVr5zQcJvNlTvQXUcXA9ZVC4W 6cnUl+SOJl8/26PFRlY3ZQ/f34AU= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:X-MC-Unique:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=Lhahnbewanmfk3GErlvAERNd/13lHNcD7mwcJZluIOmfn64nbkaLnRerSYGFLe 7kJYTIyhHj5FtC3XUuGU/rSPl1BDaK9PU1yJiCrp4xi5pdTnoz1CbWQU/rL/8zrg T0vmRbqIRM0soP/x1CZNmCcTZKeQgcrYLy3PHb/qpl/yk=; Received: (qmail 22751 invoked by alias); 1 Feb 2013 17:44:37 -0000 Received: (qmail 22642 invoked by uid 22791); 1 Feb 2013 17:44:35 -0000 X-SWARE-Spam-Status: No, hits=-2.8 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, KHOP_THREADED, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 01 Feb 2013 17:44:26 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 01 Feb 2013 17:43:01 +0000 Received: from e106375-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 1 Feb 2013 17:43:00 +0000 From: James Greenhalgh To: gcc-patches@gcc.gnu.org Cc: marcus.shawcroft@arm.com Subject: [PATCH 4/6] [AArch64-4.7] Fix warning - aarch64_trampoline_init passes the wrong type to emit_library_call. Date: Fri, 1 Feb 2013 17:42:33 +0000 Message-Id: <1359740555-10179-5-git-send-email-james.greenhalgh@arm.com> In-Reply-To: <1359740555-10179-1-git-send-email-james.greenhalgh@arm.com> References: <1359740555-10179-1-git-send-email-james.greenhalgh@arm.com> MIME-Version: 1.0 X-MC-Unique: 113020117430100201 X-IsSubscribed: yes 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 Hi, emit_library_call takes an `enum library_type` as its second argument. Currently aarch64-4.7-branch passes it an int 0. This patch fixes this, mirroring trunk, by passing LCT_NORMAL instead. This patch fixes the warning: config/aarch64/aarch64.c: In function ‘aarch64_trampoline_init’: config/aarch64/aarch64.c:3893:8: warning: enum conversion when passing argument 2 of ‘emit_library_call’ is invalid in C++ [-Wc++-compat] Regression tested on aarch64-none-elf with no regressions. OK for aarch64-4.7-branch? Thanks, James --- gcc/ 2013-02-01 James Greenhalgh * config/aarch64/aarch64.c (aarch64_trampoline_init): Pass 'LCT_NORMAL' rather than '0' to emit_library_call. diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index fef2983..434ccd7 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -3952,7 +3952,7 @@ aarch64_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value) gen_clear_cache(). */ a_tramp = XEXP (m_tramp, 0); emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__clear_cache"), - 0, VOIDmode, 2, a_tramp, Pmode, + LCT_NORMAL, VOIDmode, 2, a_tramp, Pmode, plus_constant (a_tramp, TRAMPOLINE_SIZE), Pmode); }