From patchwork Thu Aug 26 10:44:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 1521033 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GwKH24yQzz9sR4 for ; Thu, 26 Aug 2021 20:44:45 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 95A0F3858435 for ; Thu, 26 Aug 2021 10:44:43 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp002.apm-internet.net (smtp002.apm-internet.net [85.119.248.221]) by sourceware.org (Postfix) with ESMTPS id 5D9673858C27 for ; Thu, 26 Aug 2021 10:44:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5D9673858C27 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sandoe.co.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=sandoe.co.uk Received: (qmail 6868 invoked from network); 26 Aug 2021 10:44:09 -0000 X-APM-Out-ID: 16299746490686 X-APM-Authkey: 257869/1(257869/1) 2 Received: from unknown (HELO ?192.168.1.214?) (81.138.1.83) by smtp002.apm-internet.net with SMTP; 26 Aug 2021 10:44:09 -0000 From: Iain Sandoe Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.21\)) Subject: [PATCH] configure: Adjust several assembler checks to remove an unused parm. Message-Id: Date: Thu, 26 Aug 2021 11:44:08 +0100 To: GCC Patches X-Mailer: Apple Mail (2.3445.104.21) X-Spam-Status: No, score=-15.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_COUK, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Stubbs Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi, noticed while trying to apply a new change to gcc/configure.ac ------- In r12-3048-ge0b6d0b39c6, the GAS version parameter was removed from the gcc_GAS_CHECK_FEATURE macro. It seems that overlapping comit/test cycles resulted in several AMDGCN and one Darwin commit with the now extra parameter still present. This causes wrong configure code to be generated when autoreconf is used in the gcc directory. Fixed by removing the extraneous parm from the AMDGCN and Darwin cases. Checked that this produces “no change” to the configure output when “autoreconf -I -I../config -I..” is used in the gcc directory. OK if regstraps succeed on x86_64-linux and darwin? thanks Iain Signed-off-by: Iain Sandoe gcc/ChangeLog: * configure.ac (darwin2[[0-9]]* | darwin19*): Alter use of gcc_GAS_CHECK_FEATURE to remove an extraneous parameter. (amdgcn-* | gcn-*) Likewise. --- gcc/configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/configure.ac b/gcc/configure.ac index c651db7457f..6f768e02aa4 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -4709,7 +4709,7 @@ foo: nop case $target_os in darwin2[[0-9]]* | darwin19*) gcc_GAS_CHECK_FEATURE([llvm assembler x86-pad-for-align option], - gcc_cv_as_mllvm_x86_pad_for_align,, + gcc_cv_as_mllvm_x86_pad_for_align, [-mllvm -x86-pad-for-align=false], [.text],, [AC_DEFINE(HAVE_AS_MLLVM_X86_PAD_FOR_ALIGN, 1, [Define if your Mac OS X assembler supports -mllvm -x86-pad-for-align=false.])]) @@ -5350,25 +5350,25 @@ esac case "$target" in amdgcn-* | gcn-*) gcc_GAS_CHECK_FEATURE([assembler accepts -mattr=+sram-ecc for fiji], - gcc_cv_as_gcn_sram_ecc_fiji,, + gcc_cv_as_gcn_sram_ecc_fiji, [-triple=amdgcn--amdhsa -mcpu=fiji -mattr=-xnack -mattr=+sram-ecc], [.amdgcn_target "amdgcn-unknown-amdhsa--gfx803+sram-ecc"],, [AC_DEFINE(HAVE_GCN_SRAM_ECC_FIJI, 1, [Define if your assembler allows -mattr=+sram-ecc for fiji.])]) gcc_GAS_CHECK_FEATURE([assembler accepts -mattr=+sram-ecc for gfx900], - gcc_cv_as_gcn_sram_ecc_gfx900,, + gcc_cv_as_gcn_sram_ecc_gfx900, [-triple=amdgcn--amdhsa -mcpu=gfx900 -mattr=-xnack -mattr=+sram-ecc], [.amdgcn_target "amdgcn-unknown-amdhsa--gfx900+sram-ecc"],, [AC_DEFINE(HAVE_GCN_SRAM_ECC_GFX900, 1, [Define if your assembler allows -mattr=+sram-ecc for gfx900.])]) gcc_GAS_CHECK_FEATURE([assembler accepts -mattr=+sram-ecc for gfx906], - gcc_cv_as_gcn_sram_ecc_gfx906,, + gcc_cv_as_gcn_sram_ecc_gfx906, [-triple=amdgcn--amdhsa -mcpu=gfx906 -mattr=-xnack -mattr=+sram-ecc], [.amdgcn_target "amdgcn-unknown-amdhsa--gfx906+sram-ecc"],, [AC_DEFINE(HAVE_GCN_SRAM_ECC_GFX906, 1, [Define if your assembler allows -mattr=+sram-ecc for gfx906.])]) gcc_GAS_CHECK_FEATURE([assembler accepts -mattr=+sram-ecc for gfx908], - gcc_cv_as_gcn_sram_ecc_gfx908,, + gcc_cv_as_gcn_sram_ecc_gfx908, [-triple=amdgcn--amdhsa -mcpu=gfx908 -mattr=-xnack -mattr=+sram-ecc], [.amdgcn_target "amdgcn-unknown-amdhsa--gfx908+sram-ecc"],, [AC_DEFINE(HAVE_GCN_SRAM_ECC_GFX908, 1,