From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <arsen@aarsen.me>
Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151])
	by sourceware.org (Postfix) with ESMTPS id 0FA0C385E008;
	Fri, 30 Sep 2022 16:46:25 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0FA0C385E008
Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me
Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4MfGMf2xL0z9sWL;
	Fri, 30 Sep 2022 18:46:22 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001;
	t=1664556382;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=gTrZAjmDyD0H7s+Zk/WTdVqtW8epJfdpSzungLE56mc=;
	b=QGJTEL6VKLcgucbsvAjjCoOJ8/0Tz6e5WYeTMfgIphNhjzSkMf1h8dWFE1eCRKMC8DQTNk
	KO6nX859xpGUAU3a40l5lX9KVitIBe8YQn0/sWB+oQFyJDxcZ6Ft0B+KpcNSowakpgbicP
	HRISaaJnQUZc4OMaG0TKE+EIYPABtBAUdgZhG7tUvmVNr3qSIodaWiP+8m4pBq+RtcF7+c
	9MNnvT0yB3tG/fPnEmgjw8qIbHpoiqV9jucn5+uqrRM2wf9juQjcwusXtawRJQVcLL2qx9
	4n2mtfivWFLkDq+nF25NfaPsEy0Lg8ublzyXExvQoEK510uPkcYXBAjGj2iWyg==
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org,
	Jonathan Wakely <jwakely@redhat.com>,
	=?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Subject: [PATCH 03/10] libstdc++: Adjust precompiled headers for freestanding
Date: Fri, 30 Sep 2022 18:45:49 +0200
Message-Id: <20220930164556.1198044-4-arsen@aarsen.me>
In-Reply-To: <20220930164556.1198044-1-arsen@aarsen.me>
References: <20220930164556.1198044-1-arsen@aarsen.me>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 4MfGMf2xL0z9sWL
X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_INFOUSMEBIZ,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,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: <gcc-patches.gcc.gnu.org>

From: Jonathan Wakely <jwakely@redhat.com>

Co-authored-by: Arsen Arsenović <arsen@aarsen.me>

libstdc++-v3/ChangeLog:

	* include/precompiled/extc++.h [!_GLIBCXX_HOSTED]: Do not
	include headers that aren't valid for freestanding.
	* include/precompiled/stdc++.h [!_GLIBCXX_HOSTED]: Likewise.

Signed-off-by: Arsen Arsenović <arsen@aarsen.me>
---
 libstdc++-v3/include/precompiled/extc++.h | 17 +++--
 libstdc++-v3/include/precompiled/stdc++.h | 81 +++++++++++++++++++++--
 2 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/libstdc++-v3/include/precompiled/extc++.h b/libstdc++-v3/include/precompiled/extc++.h
index 7fe70738042..b094701aafb 100644
--- a/libstdc++-v3/include/precompiled/extc++.h
+++ b/libstdc++-v3/include/precompiled/extc++.h
@@ -32,14 +32,21 @@
 #include <bits/stdc++.h>
 #endif
 
-#include <ext/algorithm>
 #if __cplusplus >= 201103L
 # include <ext/aligned_buffer.h>
 #endif
 #include <ext/alloc_traits.h>
 #include <ext/atomicity.h>
-#include <ext/bitmap_allocator.h>
 #include <ext/cast.h>
+#include <ext/iterator>
+#include <ext/numeric_traits.h>
+#include <ext/pointer.h>
+#include <ext/typelist.h>
+#include <ext/type_traits.h>
+
+#if _GLIBCXX_HOSTED
+#include <ext/algorithm>
+#include <ext/bitmap_allocator.h>
 #if __cplusplus >= 201103L
 # include <ext/cmath>
 #endif
@@ -47,15 +54,12 @@
 #include <ext/debug_allocator.h>
 #include <ext/extptr_allocator.h>
 #include <ext/functional>
-#include <ext/iterator>
 #include <ext/malloc_allocator.h>
 #include <ext/memory>
 #include <ext/mt_allocator.h>
 #include <ext/new_allocator.h>
 #include <ext/numeric>
-#include <ext/numeric_traits.h>
 #include <ext/pod_char_traits.h>
-#include <ext/pointer.h>
 #include <ext/pool_allocator.h>
 #if __cplusplus >= 201103L
 # include <ext/random>
@@ -66,8 +70,6 @@
 #include <ext/stdio_filebuf.h>
 #include <ext/stdio_sync_filebuf.h>
 #include <ext/throw_allocator.h>
-#include <ext/typelist.h>
-#include <ext/type_traits.h>
 #include <ext/vstring.h>
 #include <ext/pb_ds/assoc_container.hpp>
 #include <ext/pb_ds/priority_queue.hpp>
@@ -81,3 +83,4 @@
  #include <ext/codecvt_specializations.h>
  #include <ext/enc_filebuf.h>
 #endif
+#endif // HOSTED
diff --git a/libstdc++-v3/include/precompiled/stdc++.h b/libstdc++-v3/include/precompiled/stdc++.h
index 5ee1244dc22..bfbb1654b88 100644
--- a/libstdc++-v3/include/precompiled/stdc++.h
+++ b/libstdc++-v3/include/precompiled/stdc++.h
@@ -28,6 +28,80 @@
 
 // 17.4.1.2 Headers
 
+// C
+#ifndef _GLIBCXX_NO_ASSERT
+#include <cassert>
+#endif
+#include <cctype>
+#include <cfloat>
+#include <ciso646>
+#include <climits>
+#include <csetjmp>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdlib>
+
+#if __cplusplus >= 201103L
+#include <cstdint>
+#endif
+
+// C++
+// #include <bitset>
+// #include <complex>
+#include <algorithm>
+#include <bitset>
+#include <functional>
+#include <iterator>
+#include <limits>
+#include <memory>
+#include <new>
+#include <numeric>
+#include <typeinfo>
+#include <utility>
+
+#if __cplusplus >= 201103L
+#include <array>
+#include <atomic>
+#include <initializer_list>
+#include <ratio>
+#include <scoped_allocator>
+#include <tuple>
+#include <typeindex>
+#include <type_traits>
+#endif
+
+#if __cplusplus >= 201402L
+#endif
+
+#if __cplusplus >= 201703L
+#include <any>
+#include <charconv>
+// #include <execution>
+#include <optional>
+#include <variant>
+#endif
+
+#if __cplusplus >= 202002L
+#include <bit>
+#include <compare>
+#include <concepts>
+#include <numbers>
+#include <ranges>
+#include <span>
+#include <source_location>
+#include <version>
+#endif
+
+#if __cplusplus > 202002L
+#include <expected>
+#include <stdatomic.h>
+#if __cpp_impl_coroutine
+# include <coroutine>
+#endif
+#endif
+
+
+#if _GLIBCXX_HOSTED
 // C
 #ifndef _GLIBCXX_NO_ASSERT
 #include <cassert>
@@ -62,8 +136,6 @@
 #endif
 
 // C++
-#include <algorithm>
-#include <bitset>
 #include <complex>
 #include <deque>
 #include <exception>
@@ -138,9 +210,6 @@
 #include <bit>
 #include <compare>
 #include <concepts>
-#if __cpp_impl_coroutine
-# include <coroutine>
-#endif
 #include <latch>
 #include <numbers>
 #include <ranges>
@@ -160,3 +229,5 @@
 #endif
 #include <stdatomic.h>
 #endif
+
+#endif // HOSTED
-- 
2.37.3