[gcc r10-9044] libstdc++: Fix unconditional definition of __cpp_lib_span in <version> [PR 97869}

[gcc r10-9044] libstdc++: Fix unconditional definition of __cpp_lib_span in <version> [PR 97869}

[Jonathan Wakely]

https://gcc.gnu.org/g:992643655c872f8332f9e8e453631a8fad52943a

commit r10-9044-g992643655c872f8332f9e8e453631a8fad52943a
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Nov 17 15:26:29 2020 +0000

    libstdc++: Fix unconditional definition of __cpp_lib_span in <version> [PR 97869}
    
    The <span> header is empty unless Concepts are supported, but <version>
    defines the __cpp_lib_span feature test macro unconditionally. It should
    be guarded by the same conditions as in <span>.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/97869
            * include/precompiled/stdc++.h: Include <coroutine>.
            * include/std/version (__cpp_lib_span): Check __cpp_lib_concepts
            before defining.
    
    (cherry picked from commit ecf65330c11544ebf35e198087b4a42be089c620)

Diff:
---
 libstdc++-v3/include/precompiled/stdc++.h | 3 +++
 libstdc++-v3/include/std/version          | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/precompiled/stdc++.h b/libstdc++-v3/include/precompiled/stdc++.h
index 7518a98c25a..5b8f6340448 100644
--- a/libstdc++-v3/include/precompiled/stdc++.h
+++ b/libstdc++-v3/include/precompiled/stdc++.h
@@ -137,6 +137,9 @@
 #include <bit>
 #include <compare>
 #include <concepts>
+#if __cpp_impl_coroutine
+# include <coroutine>
+#endif
 #include <numbers>
 #include <ranges>
 #include <span>
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index c3a5bd26e63..e899a1e6d99 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -218,7 +218,9 @@
 # define __cpp_lib_ranges 201911L
 #endif
 #define __cpp_lib_shift 201806L
-#define __cpp_lib_span 202002L
+#if __cpp_lib_concepts
+# define __cpp_lib_span 202002L
+#endif
 #define __cpp_lib_ssize 201902L
 #define __cpp_lib_starts_ends_with 201711L
 #define __cpp_lib_to_address 201711L