From patchwork Thu Jan 19 12:17:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyrill Tkachov X-Patchwork-Id: 717043 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v42t60zF2z9ssP for ; Thu, 19 Jan 2017 23:18:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="VrLeOHhj"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; q=dns; s=default; b=ZEUDUiYvpew4hVPY3vX5rMq32KhYP3aGIdjda3/rylV ZEaId3mzhNqqtO0FTQMKaqlfntZ/HEUo+6H6HoG1oVOmdZ+O1zRocoam9ZSNBnCi z3xpLytru1+99falzC451ECgzmOJnsRCpDyr+V6U6737sAYExfg11/yLqJ8BNsHU = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; s=default; bh=s41wI3/0RFYIm91IdPgMCc2DmGc=; b=VrLeOHhj/hEHMSPpu ww1GXVCi5WB6CZgsoau2kEKoUHPQpXIBKeTbQhvgrDmxei7x4gR3XnxHkcLtAYE5 8kwZXdpljcssMX/U7bHKy892GekjjCJ3/vetdOyNqu4JQ/yiZx3tKYG9xeMI3QtG ab89NjX6jUNaY/q7zt1TzPiOiQ= Received: (qmail 103423 invoked by alias); 19 Jan 2017 12:17:56 -0000 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 Received: (qmail 103406 invoked by uid 89); 19 Jan 2017 12:17:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.1 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=gates, Hx-languages-length:3165, sk:29a3bd7, TARGET_FLOAT X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Jan 2017 12:17:45 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D9DE01597; Thu, 19 Jan 2017 04:17:42 -0800 (PST) Received: from [10.2.207.77] (e100706-lin.cambridge.arm.com [10.2.207.77]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 23EED3F220; Thu, 19 Jan 2017 04:17:42 -0800 (PST) Message-ID: <5880AE64.2000404@foss.arm.com> Date: Thu, 19 Jan 2017 12:17:40 +0000 From: Kyrill Tkachov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: GCC Patches CC: Marcus Shawcroft , Richard Earnshaw , James Greenhalgh Subject: [PATCH][AArch64] Purge leftover occurrences of aarch64_nopcrelative_literal_loads Hi all, The patch that renamed all uses of aarch64_nopcrelative_literal_loads into aarch64_pcrelative_literal_loads missed out its extern declaration in aarch64-protos.h and a couple of its uses in aarch64.md. The aarch64_nopcrelative_literal_loads doesn't get initialised anywhere (since it's unlinked from the command-line option handling machinery) so the code that uses it is bogus. In any case, its use in the aarch64_reload_movcp and aarch64_reload_movcp expanders is redundant since they are only ever called through aarch64_secondary_reload which gates their use on !aarch64_pcrelative_literal_loads already. Since these are not standard names, their conditions don't actually matter in any way or checked at any point in the compilation AFAICS. Bootstrapped and tested on aarch64-none-linux-gnu. Ok for trunk? Thanks, Kyrill 2016-01-19 Kyrylo Tkachov * config/aarch64/aarch64-protos.h (aarch64_nopcrelative_literal_loads): Delete. * config/aarch64/aarch64.md (aarch64_reload_movcp): Delete reference to aarch64_nopcrelative_literal_loads. (aarch64_reload_movcp): Likewise. diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h index 29a3bd71151aa4fb7c6728f0fb52e2f3f233f41d..17d8a89ef0ce58b28fc8fc4713edcc4b194bbc90 100644 --- a/gcc/config/aarch64/aarch64-protos.h +++ b/gcc/config/aarch64/aarch64-protos.h @@ -453,7 +453,6 @@ int aarch64_ccmp_mode_to_code (enum machine_mode mode); bool extract_base_offset_in_addr (rtx mem, rtx *base, rtx *offset); bool aarch64_operands_ok_for_ldpstp (rtx *, bool, enum machine_mode); bool aarch64_operands_adjust_ok_for_ldpstp (rtx *, bool, enum machine_mode); -extern bool aarch64_nopcrelative_literal_loads; extern void aarch64_asm_output_pool_epilogue (FILE *, const char *, tree, HOST_WIDE_INT); diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index 7aaebd230ddb702447dd4a5d1ba4ab05441cb10a..2b0c2cc01e72d635f85ce4c56be1407986377ab3 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -5044,7 +5044,7 @@ (define_expand "aarch64_reload_movcp" [(set (match_operand:GPF_TF 0 "register_operand" "=w") (mem:GPF_TF (match_operand 1 "aarch64_constant_pool_symref" "S"))) (clobber (match_operand:P 2 "register_operand" "=&r"))] - "TARGET_FLOAT && aarch64_nopcrelative_literal_loads" + "TARGET_FLOAT" { aarch64_expand_mov_immediate (operands[2], XEXP (operands[1], 0)); emit_move_insn (operands[0], gen_rtx_MEM (mode, operands[2])); @@ -5057,7 +5057,7 @@ (define_expand "aarch64_reload_movcp" [(set (match_operand:VALL 0 "register_operand" "=w") (mem:VALL (match_operand 1 "aarch64_constant_pool_symref" "S"))) (clobber (match_operand:P 2 "register_operand" "=&r"))] - "TARGET_FLOAT && aarch64_nopcrelative_literal_loads" + "TARGET_FLOAT" { aarch64_expand_mov_immediate (operands[2], XEXP (operands[1], 0)); emit_move_insn (operands[0], gen_rtx_MEM (mode, operands[2]));