From 258059d91bd0e27cc335312f4558e1b339a2e77d Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 1 Jun 2020 16:43:01 +0100
Subject: [PATCH] libstdc++: Document API changes in GCC 10

	* doc/xml/manual/evolution.xml: Document deprecation of
	__is_nullptr_t and removal of std::allocator members.
	* doc/html/manual/api.html: Regenerate.
---
 libstdc++-v3/doc/html/manual/api.html     |  8 ++++++++
 libstdc++-v3/doc/xml/manual/evolution.xml | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/libstdc++-v3/doc/html/manual/api.html b/libstdc++-v3/doc/html/manual/api.html
index 261e7493d41..394c38c3ec5 100644
--- a/libstdc++-v3/doc/html/manual/api.html
+++ b/libstdc++-v3/doc/html/manual/api.html
@@ -394,7 +394,15 @@ now defaults to zero.
   <code class="filename">&lt;experimental/timer&gt;</code>.
 </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="api.rel_101"></a><code class="constant">10</code></h3></div></div></div><p> Deprecated features removed:
 </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"> Profile Mode </li><li class="listitem"><code class="classname">__gnu_cxx::array_allocator</code></li></ul></div><p>
+</p><p>
+  The non-standard <code class="function">std::__is_nullptr_t</code> type trait
+  was deprecated.
 </p><p>
   The <code class="classname">std::packaged_task</code> constructors taking
   an allocator argument are only defined for C++11 and C++14.
+</p><p>
+  Several members of <code class="classname">std::allocator</code> were removed
+  for C++20 mode. The removed functionality has been provided by
+  <code class="classname">std::allocator_traits</code> since C++11 and that should
+  be used instead.
 </p></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="abi.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="appendix_porting.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="backwards.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">ABI Policy and Guidelines </td><td width="20%" align="center"><a accesskey="h" href="../index.html">Home</a></td><td width="40%" align="right" valign="top"> Backwards Compatibility</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/libstdc++-v3/doc/xml/manual/evolution.xml b/libstdc++-v3/doc/xml/manual/evolution.xml
index ab04c1ad272..623d53e7faf 100644
--- a/libstdc++-v3/doc/xml/manual/evolution.xml
+++ b/libstdc++-v3/doc/xml/manual/evolution.xml
@@ -955,11 +955,23 @@ now defaults to zero.
 </itemizedlist>
 </para>
 
+<para>
+  The non-standard <function>std::__is_nullptr_t</function> type trait
+  was deprecated.
+</para>
+
 <para>
   The <classname>std::packaged_task</classname> constructors taking
   an allocator argument are only defined for C++11 and C++14.
 </para>
 
+<para>
+  Several members of <classname>std::allocator</classname> were removed
+  for C++20 mode. The removed functionality has been provided by
+  <classname>std::allocator_traits</classname> since C++11 and that should
+  be used instead.
+</para>
+
 </section>
 
 </section>
-- 
2.30.2