From 72b19b49bf25c7df988424016ac024759ede4717 Mon Sep 17 00:00:00 2001
From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 11 Jun 2010 15:31:53 +0000
Subject: [PATCH] 2010-06-11  Jonathan Wakely  <jwakely.gcc@gmail.com>

	PR libstdc++/44268
	* doc/xml/manual/abi.xml: Fix libgcc version for hppa-linux.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160617 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/ChangeLog              |  5 +++++
 libstdc++-v3/doc/xml/manual/abi.xml | 25 ++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6990691..b475094 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
+	PR libstdc++/44268
+	* doc/xml/manual/abi.xml: Fix libgcc version for hppa-linux.
+
+2010-06-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
 	* include/std/tuple (_Swallow_assign::operator=): Add const.
 	(ignore): Replace anonymous namespace member with const instance.
 
diff --git a/libstdc++-v3/doc/xml/manual/abi.xml b/libstdc++-v3/doc/xml/manual/abi.xml
index cc5370e..8777bc7 100644
--- a/libstdc++-v3/doc/xml/manual/abi.xml
+++ b/libstdc++-v3/doc/xml/manual/abi.xml
@@ -179,11 +179,26 @@ 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-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>
-    </listitem>
+    <listitem><para>gcc-3.4.x, gcc-4.[0-5].x: libgcc_s.so.1</para></listitem>
+    </itemizedlist>
+
+    <para>For m68k-linux the versions differ as follows: </para>
+
+    <itemizedlist>
+    <listitem><para>gcc-3.4.x, gcc-4.[0-5].x: libgcc_s.so.1
+    when configuring <code>--with-sjlj-exceptions</code>, or
+    libgcc_s.so.2 </para> </listitem>
+    </itemizedlist>
+
+    <para>For hppa-linux the versions differ as follows: </para>
+
+    <itemizedlist>
+    <listitem><para>gcc-3.4.x, gcc-4.[0-1].x: either libgcc_s.so.1
+    when configuring <code>--with-sjlj-exceptions</code>, or
+    libgcc_s.so.2 </para> </listitem>
+    <listitem><para>gcc-4.[2-5].x: either libgcc_s.so.3 when configuring
+    <code>--with-sjlj-exceptions</code>) or libgcc_s.so.4
+    </para> </listitem>
     </itemizedlist>
 
   </listitem>
-- 
2.7.4