From patchwork Mon Feb 6 14:24:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 53311 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2263770wrn; Mon, 6 Feb 2023 06:25:19 -0800 (PST) X-Google-Smtp-Source: AK7set9Jl4/rC2F8Vy+Z9m7A0HmUnnmMx5nv+Jv4uzIiCtBpiM4iUTejMawusrN+/AlOcu2/Zjy5 X-Received: by 2002:a50:d483:0:b0:4aa:a720:f42d with SMTP id s3-20020a50d483000000b004aaa720f42dmr6283924edi.16.1675693519778; Mon, 06 Feb 2023 06:25:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675693519; cv=none; d=google.com; s=arc-20160816; b=MYR6lmTLsqJ+lpAPF+aINkaL1Mv93P88CVWhq8CMdXEytgq47wjHVGrKkYvNNIjraz H/9LkfhzaKJSHt7EsNNIDFT667AmV47Gp0HFP6OSJ4DHmrRsgQ/rSAULPj4544ml9orJ LhXwmAtWq47HwrT7BR8qHxXzSCOl9kChsYVSpLbHvS+kQRqMuxuAdjK7igLRgo0R+mBF bjPIaOIShMPHHlz1MmhmeuQQgS/ATOJ7BFAKfQoxnf5STvYSJu/iJeBpAGC3j9OQR0Ua 50kXMKvEfk5UtZsikdYstVwyuime4mv4patBK1Lslr8YYzZIw4dBlvpg47/doUT+hpR/ LYRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=pYak/elAHxAAATxnABrr0WxG+SmfHLo5Ux7y4vXSEi8=; b=VldQ7qQRZXdLO7Xz+zyWfYfP/gQzxNsVhxBRvlic45Ny96xfAPqkfAWhXA99dhLSpy OrJcMEeaHYW64OUttTMhwiw7Kzsn9NKPOyxwNg3CyN+qFXbP2Qrtiq4D/ay0r6PanKBa qa98/6mmEgmePGwRYFQOKldA70dK2Pt6R5T9OWMhkTpcv3Y+S+9yXcsQS25PwDDPfz9U 0ZOywCaOB9ya+0qqrr3HXvPb5rIqTPi9fWYQwYuA9K3gB7ZlXG7Ho3TftoMNo450feuL o01c/vuN0mnTJOqy+AEPNQQ7ccLhZlZY5N7MzT+dLOAXZ0MEG36V7zPjYHu3+R98btvn 3Vrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=JcDmSkLV; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id l11-20020a056402124b00b004aaa5b2b267si6277597edw.147.2023.02.06.06.25.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 06:25:19 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=JcDmSkLV; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 954B0385B509 for ; Mon, 6 Feb 2023 14:25:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 954B0385B509 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675693511; bh=pYak/elAHxAAATxnABrr0WxG+SmfHLo5Ux7y4vXSEi8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=JcDmSkLVX2+K9PJ4i91QTv5yY+iprPIQQ4+c2zZ/MnShgq3HH8CiaVM5OHGvtlK7b tcd1HvbP1vo31mKlVfhmEm+sPlGNxs2SjI1ASMVK+esifbgHLcRiJfx7xKM+LUxL5u qrpA+pXUDKq5LotLLQPX09BF08Ae8TPaB8zhgalY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D24583858C83 for ; Mon, 6 Feb 2023 14:24:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D24583858C83 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-8QWlF9r2Pa2JAlAkxbA6RQ-1; Mon, 06 Feb 2023 09:24:18 -0500 X-MC-Unique: 8QWlF9r2Pa2JAlAkxbA6RQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F57485A588; Mon, 6 Feb 2023 14:24:18 +0000 (UTC) Received: from localhost (unknown [10.33.36.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDDA3C15BA0; Mon, 6 Feb 2023 14:24:17 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Disable building additional archives for freestanding Date: Mon, 6 Feb 2023 14:24:17 +0000 Message-Id: <20230206142417.2969781-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757092007970586667?= X-GMAIL-MSGID: =?utf-8?q?1757092007970586667?= Tested powerpc64le-linux. Pushed to trunk. -- >8 -- This doesn't have any effect yet as we never build anything under libstdc++-v3/src for freestanding, but that will change in the next commit. libstdc++-v3/ChangeLog: * src/Makefile.am [GLIBCXX_HOSTED] (SUBDIRS): Do not add filesystem, libbacktrace and experimental. * src/Makefile.in: Regenerate. --- libstdc++-v3/src/Makefile.am | 10 +++++++++- libstdc++-v3/src/Makefile.in | 14 +++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 53fc3d0a987..97a5363b40a 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -22,6 +22,7 @@ include $(top_srcdir)/fragment.am +if GLIBCXX_HOSTED if ENABLE_FILESYSTEM_TS filesystem_dir = filesystem else @@ -34,8 +35,15 @@ else backtrace_dir = endif +experimental_dir = experimental +else +filesystem_dir = +backtrace_dir = +experimental_dir = +endif + ## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE. -SUBDIRS = c++98 c++11 c++17 c++20 $(filesystem_dir) $(backtrace_dir) experimental +SUBDIRS = c++98 c++11 c++17 c++20 $(filesystem_dir) $(backtrace_dir) $(experimental_dir) # Cross compiler support. if VTV_CYGMIN diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index c556d0dee1b..e38b70df9fb 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -482,11 +482,15 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) -@ENABLE_FILESYSTEM_TS_FALSE@filesystem_dir = -@ENABLE_FILESYSTEM_TS_TRUE@filesystem_dir = filesystem -@ENABLE_BACKTRACE_FALSE@backtrace_dir = -@ENABLE_BACKTRACE_TRUE@backtrace_dir = libbacktrace -SUBDIRS = c++98 c++11 c++17 c++20 $(filesystem_dir) $(backtrace_dir) experimental +@ENABLE_FILESYSTEM_TS_FALSE@@GLIBCXX_HOSTED_TRUE@filesystem_dir = +@ENABLE_FILESYSTEM_TS_TRUE@@GLIBCXX_HOSTED_TRUE@filesystem_dir = filesystem +@GLIBCXX_HOSTED_FALSE@filesystem_dir = +@ENABLE_BACKTRACE_FALSE@@GLIBCXX_HOSTED_TRUE@backtrace_dir = +@ENABLE_BACKTRACE_TRUE@@GLIBCXX_HOSTED_TRUE@backtrace_dir = libbacktrace +@GLIBCXX_HOSTED_FALSE@backtrace_dir = +@GLIBCXX_HOSTED_FALSE@experimental_dir = +@GLIBCXX_HOSTED_TRUE@experimental_dir = experimental +SUBDIRS = c++98 c++11 c++17 c++20 $(filesystem_dir) $(backtrace_dir) $(experimental_dir) @VTV_CYGMIN_FALSE@toolexeclib_LTLIBRARIES = libstdc++.la # Cross compiler support.