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.129.124]) by sourceware.org (Postfix) with ESMTPS id 3BC4F3858C54 for ; Wed, 5 Oct 2022 13:16:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3BC4F3858C54 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664975774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4VAVvrY9hPaVW2oB70oCc3YcLhz58S/9ZZAkSnlJitM=; b=NaT/ef47FeJWu4yCSoADRCFuJ7bIcLIG4lvXGNqDOEDq03iLUVANyFmPQTLXK7vZnlbNeT qWyrpMPye+MvuwqO2tqyLWivGjaWxsTRSPnTcJHC8+H+TFGYaLGiGqPhJ6/ZaQK+deqZC/ aNdQGbWqRrQ8eC78/TSQ7IEg7rmEjak= 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) From: Jonathan Wakely 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 Content-Type: text/plain Content-Transfer-Encoding: 8bit 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=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: 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 \ -- 2.37.3