From c448a85e09ecdcd100b43a9bd1a0d8d7272eb5f0 Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@redhat.com>
Date: Fri, 1 Jan 2010 00:30:45 +0000
Subject: [PATCH] intro.xml: Order TR's at the end of status.

 2009-12-31  Benjamin Kosnik  <bkoz@redhat.com>

	* doc/xml/manual/intro.xml: Order TR's at the end of status.
	* doc/xml/manual/abi.xml: Update.
	* doc/xml/manual/evolution.xml: Put in stubs.

From-SVN: r155544
---
 libstdc++-v3/ChangeLog                    |  6 +++++
 libstdc++-v3/doc/xml/manual/abi.xml       | 28 ++++++++++++++++++-----
 libstdc++-v3/doc/xml/manual/evolution.xml | 24 +++++++++++++++++++
 libstdc++-v3/doc/xml/manual/intro.xml     | 12 +++++-----
 4 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index def5105d7095..434ef19b1d6f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-31  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* doc/xml/manual/intro.xml: Order TR's at the end of status.
+	* doc/xml/manual/abi.xml: Update.
+	* doc/xml/manual/evolution.xml: Put in stubs.
+
 2009-12-31  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/std/bitset (bitset<>::bitset(unsigned long long),
diff --git a/libstdc++-v3/doc/xml/manual/abi.xml b/libstdc++-v3/doc/xml/manual/abi.xml
index 5bb6a69c7b5d..6561184cc0c4 100644
--- a/libstdc++-v3/doc/xml/manual/abi.xml
+++ b/libstdc++-v3/doc/xml/manual/abi.xml
@@ -18,6 +18,9 @@
     <keyword>
       shared
     </keyword>
+    <keyword>
+      compatibility
+    </keyword>
   </keywordset>
 </sect1info>
 
@@ -176,7 +179,7 @@ compatible.
     <listitem><para>gcc-3.3.1: libgcc_s.so.1</para></listitem>
     <listitem><para>gcc-3.3.2: libgcc_s.so.1</para></listitem>
     <listitem><para>gcc-3.3.3: libgcc_s.so.1</para></listitem>
-    <listitem><para>gcc-3.4.x, gcc-4.[0-3].x: on m68k-linux and
+    <listitem><para>gcc-3.4.x, gcc-4.[0-5].x: on m68k-linux and
     hppa-linux this is either libgcc_s.so.1 (when configuring
     <code>--with-sjlj-exceptions</code>) or libgcc_s.so.2. For all
     others, this is libgcc_s.so.1.  </para>
@@ -266,7 +269,11 @@ compatible.
     <listitem><para>gcc-4.3.1: libstdc++.so.6.0.10</para></listitem>
     <listitem><para>gcc-4.3.2: libstdc++.so.6.0.10</para></listitem>
     <listitem><para>gcc-4.3.3: libstdc++.so.6.0.10</para></listitem>
+    <listitem><para>gcc-4.3.4: libstdc++.so.6.0.10</para></listitem>
     <listitem><para>gcc-4.4.0: libstdc++.so.6.0.11</para></listitem>
+    <listitem><para>gcc-4.4.1: libstdc++.so.6.0.12</para></listitem>
+    <listitem><para>gcc-4.4.2: libstdc++.so.6.0.13</para></listitem>
+    <listitem><para>gcc-4.5.0: libstdc++.so.6.0.14</para></listitem>
     </itemizedlist>
     <para>
       Note 1: Error should be libstdc++.so.3.0.3.
@@ -324,6 +331,9 @@ compatible.
     <listitem><para>gcc-4.2.0: GLIBCXX_3.4.9</para></listitem>
     <listitem><para>gcc-4.3.0: GLIBCXX_3.4.10, CXXABI_1.3.2</para></listitem>
     <listitem><para>gcc-4.4.0: GLIBCXX_3.4.11, CXXABI_1.3.3</para></listitem>
+    <listitem><para>gcc-4.4.1: GLIBCXX_3.4.12, CXXABI_1.3.3</para></listitem>
+    <listitem><para>gcc-4.4.2: GLIBCXX_3.4.13, CXXABI_1.3.3</para></listitem>
+    <listitem><para>gcc-4.5.0: GLIBCXX_3.4.14, CXXABI_1.3.4</para></listitem>
     </itemizedlist>
     </listitem>
   
@@ -350,9 +360,9 @@ compatible.
     <listitem><para>gcc-3.1.x: 100 (Error, should be 101)</para></listitem>
     <listitem><para>gcc-3.2.x: 102</para></listitem>
     <listitem><para>gcc-3.3.x: 102</para></listitem>
-    <listitem><para>gcc-3.4.x, gcc-4.[0-3].x: 102 (when n=1)</para></listitem>
-    <listitem><para>gcc-3.4.x, gcc-4.[0-3].x: 1000 + n (when n&gt;1) </para></listitem>
-    <listitem><para>gcc-3.4.x, gcc-4.[0-3].x: 999999 (when n=0)</para></listitem>
+    <listitem><para>gcc-3.4.x, gcc-4.[0-5].x: 102 (when n=1)</para></listitem>
+    <listitem><para>gcc-3.4.x, gcc-4.[0-5].x: 1000 + n (when n&gt;1) </para></listitem>
+    <listitem><para>gcc-3.4.x, gcc-4.[0-5].x: 999999 (when n=0)</para></listitem>
     </itemizedlist>
     <para></para>
     </listitem>
@@ -369,7 +379,7 @@ compatible.
     <listitem><para>gcc-3.1.x: (Error, not versioned) </para></listitem>
     <listitem><para>gcc-3.2.x: <code>-fabi-version=1</code></para></listitem>
     <listitem><para>gcc-3.3.x: <code>-fabi-version=1</code></para></listitem>
-    <listitem><para>gcc-3.4.x, gcc-4.[0-3].x: <code>-fabi-version=2</code> <emphasis>(Incompatible with previous)</emphasis></para></listitem>
+    <listitem><para>gcc-3.4.x, gcc-4.[0-5].x: <code>-fabi-version=2</code> <emphasis>(Incompatible with previous)</emphasis></para></listitem>
     </itemizedlist>
     <para></para>
     </listitem>
@@ -432,6 +442,8 @@ compatible.
     <listitem><para>gcc-4.3.2: 20080827</para></listitem>
     <listitem><para>gcc-4.3.3: 20090124</para></listitem>
     <listitem><para>gcc-4.4.0: 20090421</para></listitem>
+    <listitem><para>gcc-4.4.1: 20090722</para></listitem>
+    <listitem><para>gcc-4.4.2: 20091015</para></listitem>
     </itemizedlist>
     <para></para>
     </listitem>
@@ -472,7 +484,7 @@ compatible.
     <listitem><para>gcc-3.3.2: "3.3.2"</para></listitem>
     <listitem><para>gcc-3.3.3: "3.3.3"</para></listitem>
     <listitem><para>gcc-3.4.x: "version-unused"</para></listitem>
-    <listitem><para>gcc-4.[0-3].x: "version-unused"</para></listitem>
+    <listitem><para>gcc-4.[0-5].x: "version-unused"</para></listitem>
     </itemizedlist>
     <para></para>
     </listitem>
@@ -531,7 +543,11 @@ compatible.
     <listitem><para>gcc-4.3.0: include/c++/4.3.0</para></listitem>
     <listitem><para>gcc-4.3.1: include/c++/4.3.1</para></listitem>
     <listitem><para>gcc-4.3.3: include/c++/4.3.3</para></listitem>
+    <listitem><para>gcc-4.3.4: include/c++/4.3.4</para></listitem>
     <listitem><para>gcc-4.4.0: include/c++/4.4.0</para></listitem>
+    <listitem><para>gcc-4.4.1: include/c++/4.4.1</para></listitem>
+    <listitem><para>gcc-4.4.2: include/c++/4.4.2</para></listitem>
+    <listitem><para>gcc-4.5.0: include/c++/4.5.0</para></listitem>
     </itemizedlist>
     <para></para>
     </listitem>
diff --git a/libstdc++-v3/doc/xml/manual/evolution.xml b/libstdc++-v3/doc/xml/manual/evolution.xml
index 3c72823a8ca5..4617dcec8e8d 100644
--- a/libstdc++-v3/doc/xml/manual/evolution.xml
+++ b/libstdc++-v3/doc/xml/manual/evolution.xml
@@ -449,4 +449,28 @@ Namespace pb_ds moved to __gnu_pb_ds.
 
 </sect2>
 
+
+<sect2 id="api.rel_440">
+<title><constant>4.4</constant></title>
+  <para>
+  </para>
+<para> Extensions added: <filename class="headerfile">ext/typelist.h</filename>
+and <filename class="headerfile">ext/throw_allocator.h</filename>.
+</para>
+</sect2>
+
+<sect2 id="api.rel_450">
+<title><constant>4.5</constant></title>
+  <para>
+  </para>
+
+<para> Extensions added: <filename class="headerfile">ext/typelist.h</filename>
+and <filename class="headerfile">ext/throw_allocator.h</filename>.
+</para>
+
+<para>
+Profile mode first appears.
+</para>
+</sect2>
+
 </sect1>
diff --git a/libstdc++-v3/doc/xml/manual/intro.xml b/libstdc++-v3/doc/xml/manual/intro.xml
index a3cdbdf1c46d..6d532612ade8 100644
--- a/libstdc++-v3/doc/xml/manual/intro.xml
+++ b/libstdc++-v3/doc/xml/manual/intro.xml
@@ -35,16 +35,16 @@
 		parse="xml" href="status_cxx1998.xml">
     </xi:include>
 
-    <!-- Section 01.2 : Status C++ TR1 -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-		parse="xml" href="status_cxxtr1.xml">
-    </xi:include>
-
-    <!-- Section 01.3 : Status C++ 200x -->
+    <!-- Section 01.2 : Status C++ 200x -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		parse="xml" href="status_cxx200x.xml">
     </xi:include>    
 
+    <!-- Section 01.3 : Status C++ TR1 -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		parse="xml" href="status_cxxtr1.xml">
+    </xi:include>
+
     <!-- Section 01.4 : Status C++ TR24733 -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		parse="xml" href="status_cxxtr24733.xml">
-- 
GitLab