From patchwork Thu Sep 7 09:29:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 1830820 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=YkneVd/q; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RhDV74cCKz1yh1 for ; Thu, 7 Sep 2023 19:29:50 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 67959385841E for ; Thu, 7 Sep 2023 09:29:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 67959385841E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694078986; bh=krdrJHARBA8EJW4EB66WdvOfMwj0jmi0iudEVGU92QE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=YkneVd/qlB8MpRtVNqsSVApBOsI2fSPxIwEbReaGOIdZRlhru5+Zu14g4A+Q2zhb+ OLaOKHISYYEAMZgvle8O2W2Gtvua6N1T450vmS0Mzqvq+O8EB6KOhTacOAfVd78ck4 LU7j66duLqsGkOrxgkoG6P6etELdl1rje37OGcZo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id 4E18B3858D1E for ; Thu, 7 Sep 2023 09:29:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4E18B3858D1E 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 D8D51153B for ; Thu, 7 Sep 2023 02:30:02 -0700 (PDT) Received: from localhost (e121540-lin.manchester.arm.com [10.32.110.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8FC193F64C for ; Thu, 7 Sep 2023 02:29:24 -0700 (PDT) To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [PATCH] Tweak language choice in config-list.mk Date: Thu, 07 Sep 2023 10:29:23 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-25.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Sandiford via Gcc-patches From: Richard Sandiford Reply-To: Richard Sandiford Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" When I tried to use config-list.mk, the build for every triple except the build machine's failed for m2. This is because, unlike other languages, m2 builds target objects during all-gcc. The build will therefore fail unless you have access to an appropriate binutils (or an equivalent). That's quite a big ask for over 100 targets. :) This patch therefore makes m2 an optional inclusion. Doing that wasn't entirely straightforward though. The current configure line includes "--enable-languages=all,...", which means that the "..." can only force languages to be added that otherwise wouldn't have been. (I.e. the only effect of the "..." is to override configure autodetection.) The choice of all,ada and: # Make sure you have a recent enough gcc (with ada support) in your path so # that --enable-werror-always will work. make it clear that lack of GNAT should be a build failure rather than silently ignored. This predates the D frontend, which requires GDC in the same way that Ada requires GNAT. I don't know of a reason why D should be treated differently. The patch therefore expands the "all" into a specific list of languages. That in turn meant that Fortran had to be handled specially, since bpf and mmix don't support Fortran. Perhaps there's an argument that m2 shouldn't build target objects during all-gcc, but (a) it works for practical usage and (b) the patch is an easy workaround. I'd be happy for the patch to be reverted if the build system changes. OK to install? Richard gcc/ * contrib/config-list.mk (OPT_IN_LANGUAGES): New variable. ($(LIST)): Replace --enable-languages=all with a specifc list. Disable fortran on bpf and mmix. Enable the languages in OPT_IN_LANGUAGES. --- contrib/config-list.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/contrib/config-list.mk b/contrib/config-list.mk index e570b13c71b..50ecb014bc0 100644 --- a/contrib/config-list.mk +++ b/contrib/config-list.mk @@ -12,6 +12,11 @@ TEST=all-gcc # supply an absolute path. GCC_SRC_DIR=../../gcc +# Define this to ,m2 if you want to build Modula-2. Modula-2 builds target +# objects during all-gcc, so it can only be included if you've installed +# binutils (or an equivalent) for each target. +OPT_IN_LANGUAGES= + # Use -j / -l make arguments and nice to assure a smooth resource-efficient # load on the build machine, e.g. for 24 cores: # svn co svn://gcc.gnu.org/svn/gcc/branches/foo-branch gcc @@ -126,17 +131,23 @@ $(LIST): make-log-dir TGT=`echo $@ | awk 'BEGIN { FS = "OPT" }; { print $$1 }'` && \ TGT=`$(GCC_SRC_DIR)/config.sub $$TGT` && \ case $$TGT in \ - *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix* | bpf-*-*) \ + bpf-*-*) \ ADDITIONAL_LANGUAGES=""; \ ;; \ - *) \ + *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix* | bpf-*-*) \ + ADDITIONAL_LANGUAGES=",fortran"; \ + ;; \ + mmix-*-*) \ ADDITIONAL_LANGUAGES=",go"; \ ;; \ + *) \ + ADDITIONAL_LANGUAGES=",fortran,go"; \ + ;; \ esac && \ $(GCC_SRC_DIR)/configure \ --target=$(subst SCRIPTS,`pwd`/../scripts/,$(subst OPT,$(empty) -,$@)) \ --enable-werror-always ${host_options} \ - --enable-languages=all,ada$$ADDITIONAL_LANGUAGES; \ + --enable-languages=c,ada,c++,d,lto,objc,obj-c++,rust$$ADDITIONAL_LANGUAGES$(OPT_IN_LANGUAGES); \ ) > log/$@-config.out 2>&1 $(LOGFILES) : log/%-make.out : %