diff --git a/libstdc++-v3/doc/html/manual/status.html b/libstdc++-v3/doc/html/manual/status.html
index 4442e195cc45de8565c3ac86983dc6f2d8e927eb..884de7ca8d2c35f1e3a264ec71149fd8d72021d0 100644
--- a/libstdc++-v3/doc/html/manual/status.html
+++ b/libstdc++-v3/doc/html/manual/status.html
@@ -1061,11 +1061,11 @@ Feature-testing recommendations for C++</a>.
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0053r7.pdf" target="_top">
P0053R7
</a>
- </td><td align="center"> </td><td align="left">Â </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Add constexpr modifiers to functions in <code class="code"><algorithm></code> and <code class="code"><utility></code> Headers </td><td align="left">
+ </td><td align="center"> </td><td align="left">Â </td></tr><tr><td align="left"> Add constexpr modifiers to functions in <code class="code"><algorithm></code> and <code class="code"><utility></code> Headers </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0202r3.html" target="_top">
P0202R3
</a>
- </td><td align="center"> </td><td align="left">Â </td></tr><tr><td align="left"> Constexpr for <code class="code">std::complex</code> </td><td align="left">
+ </td><td align="center"> 10.1 </td><td align="left"> <code class="code">__cpp_lib_constexpr_algorithms >= 201703L</code> </td></tr><tr><td align="left"> Constexpr for <code class="code">std::complex</code> </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0415r1.html" target="_top">
P0415R1
</a>
@@ -1133,11 +1133,12 @@ Feature-testing recommendations for C++</a>.
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0809r0.pdf" target="_top">
P0809R0
</a>
- </td><td align="center"> </td><td align="left">Â </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Constexpr iterator requirements </td><td align="left">
+ </td><td align="center"> </td><td align="left">Â </td></tr><tr><td align="left"> Constexpr iterator requirements </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0858r0.html" target="_top">
P0858R0
</a>
- </td><td align="center"> </td><td align="left">Â </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Symmetry for spaceship </td><td align="left">
+ </td><td align="center"> 9.1 </td><td align="left"> <code class="code">__cpp_lib_string_view >= 201803L</code>
+ and <code class="code">__cpp_lib_array_constexpr >= 201803L</code> </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Symmetry for spaceship </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0905r1.html" target="_top">
P0905R1
</a>
@@ -1201,11 +1202,11 @@ Feature-testing recommendations for C++</a>.
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0788r3.pdf" target="_top">
P0788R3
</a>
- </td><td align="center"> </td><td align="left">Â </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Constexpr for <code class="code">swap</code> and swap related functions </td><td align="left">
+ </td><td align="center"> </td><td align="left">Â </td></tr><tr><td align="left"> Constexpr for <code class="code">swap</code> and swap related functions </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0879r0.html" target="_top">
P0879R0
</a>
- </td><td align="center"> </td><td align="left">Â </td></tr><tr><td align="left"> The <code class="code">identity</code> metafunction </td><td align="left">
+ </td><td align="center"> 10.1 </td><td align="left"> <code class="code">__cpp_lib_constexpr_algorithms >= 201806L</code> </td></tr><tr><td align="left"> The <code class="code">identity</code> metafunction </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0887r1.pdf" target="_top">
P0887R1
</a>
@@ -1225,11 +1226,11 @@ Feature-testing recommendations for C++</a>.
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0941r2.html" target="_top">
P0941R2
</a>
- </td><td align="center"> 5.1 </td><td align="left">Â </td></tr><tr bgcolor="#C8B0B0"><td align="left"> <code class="code">constexpr</code> comparison operators for <code class="code">std::array</code> </td><td align="left">
+ </td><td align="center"> 5.1 </td><td align="left">Â </td></tr><tr><td align="left"> <code class="code">constexpr</code> comparison operators for <code class="code">std::array</code> </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p1023r0.pdf" target="_top">
P1023R0
</a>
- </td><td align="center"> </td><td align="left">Â </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Update The Reference To The Unicode Standard </td><td align="left">
+ </td><td align="center"> 10.1 </td><td align="left">Â </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Update The Reference To The Unicode Standard </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p1025r1.html" target="_top">
P1025R1
</a>
@@ -1315,11 +1316,11 @@ Feature-testing recommendations for C++</a>.
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p1032r1.html" target="_top">
P1032R1
</a>
- </td><td align="center"> </td><td align="left">Â </td></tr><tr bgcolor="#C8B0B0"><td align="left"> Should Span be Regular? </td><td align="left">
+ </td><td align="center"> </td><td align="left">Â </td></tr><tr><td align="left"> Should Span be Regular? </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p1085r2.md" target="_top">
P1085R2
</a>
- </td><td align="center"> </td><td align="left">Â </td></tr><tr><td align="left"> Editorial Guidance for merging P0019r8 and P0528r3 </td><td align="left">
+ </td><td align="center"> 10.1 </td><td align="left"> <code class="code">__cpp_lib_span >= 201902L</code> </td></tr><tr><td align="left"> Editorial Guidance for merging P0019r8 and P0528r3 </td><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p1123r0.html" target="_top">
P1123R0
</a>
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2020.xml b/libstdc++-v3/doc/xml/manual/status_cxx2020.xml
index fa0c89dd346e52bb1d11e8b27a1529dcff5440a9..72c38ef985cfa3d3590db6dc3dfd1c37989c8458 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx2020.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx2020.xml
@@ -101,15 +101,14 @@ Feature-testing recommendations for C++</link>.
</row>
<row>
- <?dbhtml bgcolor="#C8B0B0" ?>
<entry> Add constexpr modifiers to functions in <code><algorithm></code> and <code><utility></code> Headers </entry>
<entry>
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0202r3.html">
P0202R3
</link>
</entry>
- <entry align="center"> </entry>
- <entry />
+ <entry align="center"> 10.1 </entry>
+ <entry> <code>__cpp_lib_constexpr_algorithms >= 201703L</code> </entry>
</row>
<row>
@@ -307,15 +306,15 @@ Feature-testing recommendations for C++</link>.
</row>
<row>
- <?dbhtml bgcolor="#C8B0B0" ?>
<entry> Constexpr iterator requirements </entry>
<entry>
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0858r0.html">
P0858R0
</link>
</entry>
- <entry align="center"> </entry>
- <entry />
+ <entry align="center"> 9.1 </entry>
+ <entry> <code>__cpp_lib_string_view >= 201803L</code>
+ and <code>__cpp_lib_array_constexpr >= 201803L</code> </entry>
</row>
<row>
@@ -503,15 +502,14 @@ Feature-testing recommendations for C++</link>.
</row>
<row>
- <?dbhtml bgcolor="#C8B0B0" ?>
<entry> Constexpr for <code>swap</code> and swap related functions </entry>
<entry>
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0879r0.html">
P0879R0
</link>
</entry>
- <entry align="center"> </entry>
- <entry />
+ <entry align="center"> 10.1 </entry>
+ <entry> <code>__cpp_lib_constexpr_algorithms >= 201806L</code> </entry>
</row>
<row>
@@ -571,14 +569,13 @@ Feature-testing recommendations for C++</link>.
</row>
<row>
- <?dbhtml bgcolor="#C8B0B0" ?>
<entry> <code>constexpr</code> comparison operators for <code>std::array</code> </entry>
<entry>
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p1023r0.pdf">
P1023R0
</link>
</entry>
- <entry align="center"> </entry>
+ <entry align="center"> 10.1 </entry>
<entry />
</row>
@@ -823,15 +820,14 @@ Feature-testing recommendations for C++</link>.
</row>
<row>
- <?dbhtml bgcolor="#C8B0B0" ?>
<entry> Should Span be Regular? </entry>
<entry>
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p1085r2.md">
P1085R2
</link>
</entry>
- <entry align="center"> </entry>
- <entry />
+ <entry align="center"> 10.1 </entry>
+ <entry> <code>__cpp_lib_span >= 201902L</code> </entry>
</row>
<row>