From patchwork Fri Jun 11 15:41:57 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jonathan Wakely <jwakely.gcc@gmail.com>
X-Patchwork-Id: 55338
Return-Path: 
 <gcc-patches-return-264995-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id 979E5B7D5C
	for <incoming@patchwork.ozlabs.org>;
	Sat, 12 Jun 2010 01:42:11 +1000 (EST)
Received: (qmail 354 invoked by alias); 11 Jun 2010 15:42:09 -0000
Received: (qmail 337 invoked by uid 22791); 11 Jun 2010 15:42:08 -0000
X-SWARE-Spam-Status: No, hits=-1.8 required=5.0	tests=AWL, BAYES_00,
	DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, TW_JL
X-Spam-Check-By: sourceware.org
Received: from mail-wy0-f193.google.com (HELO mail-wy0-f193.google.com)
	(74.125.82.193) by sourceware.org (qpsmtpd/0.43rc1) with
	ESMTP; Fri, 11 Jun 2010 15:42:03 +0000
Received: by wye20 with SMTP id 20so275150wye.8 for <multiple recipients>;
	Fri, 11 Jun 2010 08:42:00 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.216.185.78 with SMTP id t56mr1145179wem.40.1276270917171;
	Fri, 	11 Jun 2010 08:41:57 -0700 (PDT)
Received: by 10.216.71.12 with HTTP; Fri, 11 Jun 2010 08:41:57 -0700 (PDT)
Date: Fri, 11 Jun 2010 16:41:57 +0100
Message-ID: <AANLkTikEGxGDvJU4n4kekXHQ4lkAi46u74NuLCnPvMJN@mail.gmail.com>
Subject: libstdc++/44268 document libgcc version for hppa-linux
From: Jonathan Wakely <jwakely.gcc@gmail.com>
To: "libstdc++" <libstdc++@gcc.gnu.org>,
	gcc-patches <gcc-patches@gcc.gnu.org>
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

2010-06-11  Jonathan Wakely  <jwakely.gcc@gmail.com>

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

committed to trunk

Index: doc/xml/manual/abi.xml
===================================================================
--- doc/xml/manual/abi.xml	(revision 160340)
+++ doc/xml/manual/abi.xml	(working copy)
@@ -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>