From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id A5707385043F for ; Tue, 15 Jun 2021 23:18:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A5707385043F Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-1oklXLDzM0SECJd6ihTjmQ-1; Tue, 15 Jun 2021 19:18:50 -0400 X-MC-Unique: 1oklXLDzM0SECJd6ihTjmQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 819B5107ACF6; Tue, 15 Jun 2021 23:18:49 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-112-7.ams2.redhat.com [10.36.112.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DDA418F0A; Tue, 15 Jun 2021 23:18:48 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.16.1/8.16.1) with ESMTPS id 15FNIlbN1978045 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 16 Jun 2021 01:18:47 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.16.1/8.16.1/Submit) id 15FNIkf11977717; Wed, 16 Jun 2021 01:18:46 +0200 Date: Wed, 16 Jun 2021 01:18:45 +0200 From: Jakub Jelinek To: Pierre-Marie de Rodat Cc: gcc-patches@gcc.gnu.org, Arnaud Charlet Subject: Re: [Ada] Use runtime from base compiler during stage1 Message-ID: <20210615231845.GV7746@tucnak> Reply-To: Jakub Jelinek References: <20210615102052.GA3883@adacore.com> MIME-Version: 1.0 In-Reply-To: <20210615102052.GA3883@adacore.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , X-List-Received-Date: Tue, 15 Jun 2021 23:18:53 -0000 On Tue, Jun 15, 2021 at 06:20:52AM -0400, Pierre-Marie de Rodat wrote: > When performing a bootstrap with Ada, we are currently using the runtime > files from the repository during stage1, causing some subtle > inconsistencies during stage1 of the bootstrap, sometimes hard to > workaround. This change now uses the runtime from the base compiler > during stage1 only. We still rely on a few more recent runtime services, > so we have to copy some files from libgnat to /gcc/ada in > the process. > > Tested on x86_64-pc-linux-gnu, committed on trunk > > gcc/ada/ > > * Make-generated.in: Add rule to copy runtime files needed > during stage1. > * raise.c: Remove obsolete symbols used during bootstrap. > * gcc-interface/Make-lang.in: Do not use libgnat sources during > stage1. > (GNAT_ADA_OBJS, GNATBIND_OBJS): Split in two parts, the common > part and the part only used outside of stage1. > (ADA_GENERATED_FILES): Add runtime files needed during bootstrap > when recent APIs are needed. > (ada/b_gnatb.adb): Remove prerequisite. > * gcc-interface/system.ads: Remove obsolete entries. This breaks bootstrap on Fedora, where usually only libgnat.so* and not libgnat.a is installed (one needs to install libgnat-static for it to be present). Shouldn't it instead just add -L $(dir $(shell $(CC) -print-libgcc-file-name))adalib/ -lgnat instead of forcing to always link against libgnat.a? Or at least test whether libgnat.a is present and otherwise use the above. Jakub