From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id DFA05385802B for ; Thu, 29 Sep 2022 10:40:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DFA05385802B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4425815BF for ; Thu, 29 Sep 2022 03:40:37 -0700 (PDT) Received: from localhost (e121540-lin.manchester.arm.com [10.32.98.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3DAD33F73B for ; Thu, 29 Sep 2022 03:40:30 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [PATCH 05/17] aarch64: Small config.gcc cleanups References: Date: Thu, 29 Sep 2022 11:40:28 +0100 In-Reply-To: (Richard Sandiford's message of "Thu, 29 Sep 2022 11:39:11 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-46.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The aarch64-option-extensions.def parsing in config.gcc had some code left over from when it tried to parse the whole macro definition. Also, config.gcc now only looks at the first fields of the aarch64-arches.def entries. gcc/ * config.gcc: Remove dead aarch64-option-extensions.def code. * config/aarch64/aarch64-arches.def: Update comment. --- gcc/config.gcc | 8 -------- gcc/config/aarch64/aarch64-arches.def | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index 7eb07870425..555f257c2e7 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -4100,14 +4100,6 @@ case "${target}" in options_parsed="`$ac_cv_prog_CPP -D"$opt_macro" -x c \ ${srcdir}/config/aarch64/aarch64-option-extensions.def`" - # Match one element inside AARCH64_OPT_EXTENSION, we - # consume anything that's not a ,. - elem="[ ]*\([^,]\+\)[ ]*" - - # Repeat the pattern for the number of entries in the - # AARCH64_OPT_EXTENSION, currently 6 times. - sed_patt="^$elem,$elem,$elem,$elem,$elem,$elem" - while [ x"$ext_val" != x ] do ext_val=`echo $ext_val | sed -e 's/\+//'` diff --git a/gcc/config/aarch64/aarch64-arches.def b/gcc/config/aarch64/aarch64-arches.def index e422028224b..ece96e22a70 100644 --- a/gcc/config/aarch64/aarch64-arches.def +++ b/gcc/config/aarch64/aarch64-arches.def @@ -28,7 +28,7 @@ ARCH_REV is an integer specifying the architecture major revision. FLAGS are the flags implied by the architecture. Due to the assumptions about the positions of these fields in config.gcc, - the NAME should be kept as the first argument and FLAGS as the last. */ + NAME should be kept as the first argument. */ AARCH64_ARCH("armv8-a", generic, V8A, 8, AARCH64_FL_FOR_V8A) AARCH64_ARCH("armv8.1-a", generic, V8_1A, 8, AARCH64_FL_FOR_V8_1A) -- 2.25.1