aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2010-06-11 15:31:53 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2010-06-11 16:31:53 +0100
commit4f45eb71c2ff2f13d6d1453da5a2e84105f1514f (patch)
treeaee92a0b21556c584fa010c2b4da3adfc3f7558b
parent0a42aa4ed5b5d2a6e31a465db1515a716332d509 (diff)
downloadgcc-4f45eb71c2ff2f13d6d1453da5a2e84105f1514f.zip
gcc-4f45eb71c2ff2f13d6d1453da5a2e84105f1514f.tar.gz
gcc-4f45eb71c2ff2f13d6d1453da5a2e84105f1514f.tar.bz2
re PR libstdc++/44268 (abi docs say that hppa-linux defaults to libgcc_s.so.2)
2010-06-11 Jonathan Wakely <jwakely.gcc@gmail.com> PR libstdc++/44268 * doc/xml/manual/abi.xml: Fix libgcc version for hppa-linux. From-SVN: r160617
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/doc/xml/manual/abi.xml25
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..8777bc72 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>