From patchwork Wed Oct 5 13:16:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1734 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp593040wrs; Wed, 5 Oct 2022 06:17:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5nGvQCxB0SJgv49uf9uEQbRi0F+eb1f6y4IX5CxkD+94J1VLRAZBpJHMgSozzSR/A2PFz1 X-Received: by 2002:a05:6402:3208:b0:458:9e25:50d0 with SMTP id g8-20020a056402320800b004589e2550d0mr20892915eda.283.1664975832395; Wed, 05 Oct 2022 06:17:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664975832; cv=none; d=google.com; s=arc-20160816; b=ZI/w3rnqj6jDeZSX51dn43fwQ0rl+lkJ+zuuJ22FwhDrC/y3VtVMdQ1Hwa17Mgl6vJ CPqgM6cCijdIZqC5FhBwa1O2n54FvmbN+H2M8GpYxcYvPLycbIQ1A5XQiezRouIr6ITq 1tqiVTuf9aXqHodMjpJ0pz/u/mpf100JtlbwA+1x2qJgzNfuecpz3Ocx9li2vE0tF8Fb si6Z5gvalM5qkA+Owmq1OfnQ6U1wS6f8/z3GBfCB41qO7TPah0cN7PGfOXgqUfEt/lyB 5IK1waPQCX+r5yNT09WZu1fuEQ3/bxzk//GpYimK2JlznJk48V5+mTQdzkD+/HElBTAI pplQ== 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=4VAVvrY9hPaVW2oB70oCc3YcLhz58S/9ZZAkSnlJitM=; b=UYoEl0J/kDJy5gGgOIBf9x88H9mn/nph6RCfMg+C8rPe4OT2IowAalji7LiQerNqWk nHpqyd/g94dJS2kK/+brxqZPYRO7AhQlnct+VaPKt+SiWaQCVBMNGpATkHcauFRegBGk s4fbDyCCGH+I9E7bIT28WoudkAHibuF6qQhcjxXQnkESfkIkIFl+XOv+rGhjG19U5G0E 2gSrsPFv0axKsEsR3quanHYlYZZuV1+KE7z2f8i/197Cj5l41U3nelPISZkrY2YAsLtq siIVhGsDRyHdlTc2T+tBmNLvM4FvsfQDbLwyOfyPdmNZ2FJVKTEAeFqvMWTTgUjGmWVn k2dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=unDeNrYy; 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 qb1-20020a1709077e8100b0078346f6a75fsi15029176ejc.709.2022.10.05.06.17.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Oct 2022 06:17:12 -0700 (PDT) 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=unDeNrYy; 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 26B54385736A for ; Wed, 5 Oct 2022 13:17:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26B54385736A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664975822; bh=4VAVvrY9hPaVW2oB70oCc3YcLhz58S/9ZZAkSnlJitM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=unDeNrYy9YlAqBXOdNiiZh/nYy300lvD9slDBONK3KMNYAO+bqoxMk5xJgNp6F2rp We5NQhVWiGRHqn+RC2OZuwvKWss3AxAufYUdn6dbcJe0XQLeHVlwGxFNowtTDRau9m 4P9mxUDE7pwhYe2JRAwzhRZqKgpkP0UxkQT3SMD0= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 4EC1C3858C2D for ; Wed, 5 Oct 2022 13:16:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4EC1C3858C2D 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-637-RMsKEDvMNiqYq3ukdLRFog-1; Wed, 05 Oct 2022 09:16:13 -0400 X-MC-Unique: RMsKEDvMNiqYq3ukdLRFog-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 01871882822; Wed, 5 Oct 2022 13:16:13 +0000 (UTC) Received: from localhost (unknown [10.33.36.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D7A1477F62; Wed, 5 Oct 2022 13:16:12 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libtdc++: Regenerate Makefile.in after freestanding header changes Date: Wed, 5 Oct 2022 14:16:11 +0100 Message-Id: <20221005131611.703378-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 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_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable 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?1745853698456995302?= X-GMAIL-MSGID: =?utf-8?q?1745853698456995302?= I forgot to do this after applying Arsen's patches to my tree. Tested x86_64-linux. Pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * include/Makefile.in: Regenerate. --- libstdc++-v3/include/Makefile.in | 101 +++++++++++++++---------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 26d2f6a6d85..9d6075511f7 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -380,13 +380,6 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) -# Regarding *_freestanding: -# For including files in freestanding, create a new _freestanding variable, and -# split *_headers across an ``if GLIBCXX_HOSTED'', then update install-headers -# to account for the new directory/set being added. -# If such a variable exists, simply add to either *_headers or *_freestanding, -# as appropriate. - # Standard C++ includes. std_srcdir = ${glibcxx_srcdir}/include/std std_builddir = . @@ -395,20 +388,25 @@ std_freestanding = \ ${std_srcdir}/array \ ${std_srcdir}/atomic \ ${std_srcdir}/bit \ + ${std_srcdir}/bitset \ ${std_srcdir}/concepts \ ${std_srcdir}/coroutine \ + ${std_srcdir}/expected \ ${std_srcdir}/functional \ ${std_srcdir}/iterator \ ${std_srcdir}/limits \ ${std_srcdir}/memory \ ${std_srcdir}/numbers \ + ${std_srcdir}/numeric \ ${std_srcdir}/optional \ ${std_srcdir}/ranges \ ${std_srcdir}/ratio \ + ${std_srcdir}/scoped_allocator \ ${std_srcdir}/source_location \ ${std_srcdir}/span \ ${std_srcdir}/tuple \ ${std_srcdir}/type_traits \ + ${std_srcdir}/typeindex \ ${std_srcdir}/utility \ ${std_srcdir}/variant \ ${std_srcdir}/version @@ -418,7 +416,6 @@ std_freestanding = \ @GLIBCXX_HOSTED_TRUE@ ${std_freestanding} \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/any \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/barrier \ -@GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/bitset \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/charconv \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/chrono \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/codecvt \ @@ -426,7 +423,6 @@ std_freestanding = \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/condition_variable \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/deque \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/execution \ -@GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/expected \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/filesystem \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/forward_list \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/fstream \ @@ -442,12 +438,10 @@ std_freestanding = \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/map \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/memory_resource \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/mutex \ -@GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/numeric \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/ostream \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/queue \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/random \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/regex \ -@GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/scoped_allocator \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/semaphore \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/set \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/shared_mutex \ @@ -463,7 +457,6 @@ std_freestanding = \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/string_view \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/system_error \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/thread \ -@GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/typeindex \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/unordered_map \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/unordered_set \ @GLIBCXX_HOSTED_TRUE@ ${std_srcdir}/valarray \ @@ -478,6 +471,7 @@ bits_freestanding = \ ${bits_srcdir}/alloc_traits.h \ ${bits_srcdir}/atomic_base.h \ ${bits_srcdir}/c++0x_warning.h \ + ${bits_srcdir}/boost_concept_check.h \ ${bits_srcdir}/concept_check.h \ ${bits_srcdir}/cpp_type_traits.h \ ${bits_srcdir}/enable_special_members.h \ @@ -506,6 +500,7 @@ bits_freestanding = \ ${bits_srcdir}/stl_iterator.h \ ${bits_srcdir}/stl_iterator_base_funcs.h \ ${bits_srcdir}/stl_iterator_base_types.h \ + ${bits_srcdir}/stl_numeric.h \ ${bits_srcdir}/stl_heap.h \ ${bits_srcdir}/stl_pair.h \ ${bits_srcdir}/stl_raw_storage_iter.h \ @@ -528,7 +523,6 @@ bits_freestanding = \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/basic_ios.tcc \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/basic_string.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/basic_string.tcc \ -@GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/boost_concept_check.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/char_traits.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/charconv.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/chrono.h \ @@ -601,7 +595,6 @@ bits_freestanding = \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/stl_map.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/stl_multimap.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/stl_multiset.h \ -@GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/stl_numeric.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/stl_queue.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/stl_relops.h \ @GLIBCXX_HOSTED_TRUE@ ${bits_srcdir}/stl_set.h \ @@ -974,49 +967,53 @@ pb_headers7 = \ ext_srcdir = ${glibcxx_srcdir}/include/ext ext_builddir = ./ext -ext_headers = \ - ${ext_srcdir}/algorithm \ +ext_freestanding = \ ${ext_srcdir}/aligned_buffer.h \ ${ext_srcdir}/alloc_traits.h \ ${ext_srcdir}/atomicity.h \ - ${ext_srcdir}/bitmap_allocator.h \ ${ext_srcdir}/cast.h \ - ${ext_srcdir}/cmath \ - ${ext_srcdir}/codecvt_specializations.h \ ${ext_srcdir}/concurrence.h \ - ${ext_srcdir}/debug_allocator.h \ - ${ext_srcdir}/enc_filebuf.h \ - ${ext_srcdir}/extptr_allocator.h \ - ${ext_srcdir}/functional \ - ${ext_srcdir}/iterator \ - ${ext_srcdir}/malloc_allocator.h \ - ${ext_srcdir}/memory \ - ${ext_srcdir}/mt_allocator.h \ - ${ext_srcdir}/new_allocator.h \ - ${ext_srcdir}/numeric \ ${ext_srcdir}/numeric_traits.h \ - ${ext_srcdir}/pod_char_traits.h \ + ${ext_srcdir}/iterator \ ${ext_srcdir}/pointer.h \ - ${ext_srcdir}/pool_allocator.h \ - ${ext_srcdir}/random \ - ${ext_srcdir}/random.tcc \ - ${ext_srcdir}/rb_tree \ - ${ext_srcdir}/rc_string_base.h \ - ${ext_srcdir}/rope \ - ${ext_srcdir}/ropeimpl.h \ - ${ext_srcdir}/slist \ - ${ext_srcdir}/sso_string_base.h \ - ${ext_srcdir}/stdio_filebuf.h \ - ${ext_srcdir}/stdio_sync_filebuf.h \ - ${ext_srcdir}/string_conversions.h \ - ${ext_srcdir}/throw_allocator.h \ - ${ext_srcdir}/typelist.h \ ${ext_srcdir}/type_traits.h \ - ${ext_srcdir}/vstring_fwd.h \ - ${ext_srcdir}/vstring.h \ - ${ext_srcdir}/vstring.tcc \ - ${ext_srcdir}/vstring_util.h \ - ${ext_compat_headers} + ${ext_srcdir}/typelist.h + +@GLIBCXX_HOSTED_FALSE@ext_headers = ${ext_freestanding} +@GLIBCXX_HOSTED_TRUE@ext_headers = \ +@GLIBCXX_HOSTED_TRUE@ ${ext_freestanding} \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/algorithm \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/bitmap_allocator.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/cmath \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/codecvt_specializations.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/debug_allocator.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/enc_filebuf.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/extptr_allocator.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/functional \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/malloc_allocator.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/memory \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/mt_allocator.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/new_allocator.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/numeric \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/pod_char_traits.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/pool_allocator.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/random \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/random.tcc \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/rb_tree \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/rc_string_base.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/rope \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/ropeimpl.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/slist \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/sso_string_base.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/stdio_filebuf.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/stdio_sync_filebuf.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/string_conversions.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/throw_allocator.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/vstring_fwd.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/vstring.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/vstring.tcc \ +@GLIBCXX_HOSTED_TRUE@ ${ext_srcdir}/vstring_util.h \ +@GLIBCXX_HOSTED_TRUE@ ${ext_compat_headers} ext_compat_headers = \ ${backward_srcdir}/hash_set \ @@ -1945,9 +1942,6 @@ install-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${backward_builddir} for file in ${backward_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${backward_builddir}; done - $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${ext_builddir} - for file in ${ext_headers}; do \ - $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${ext_builddir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} for file in ${std_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done @@ -1962,6 +1956,9 @@ install-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir} for file in ${c_base_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${ext_builddir} + for file in ${ext_headers}; do \ + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${ext_builddir}; done @GLIBCXX_HOSTED_TRUE@ for dir in ${pb_subdirs}; do \ @GLIBCXX_HOSTED_TRUE@ $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/$${dir} ; done @GLIBCXX_HOSTED_TRUE@ for file in ${pb_headers1}; do \