From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <binutils-return-34574-listarch-binutils=sources.redhat.com@sources.redhat.com>
Received: (qmail 2277 invoked by alias); 1 Jul 2004 22:50:05 -0000
Mailing-List: contact binutils-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:binutils-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/binutils/>
List-Post: <mailto:binutils@sources.redhat.com>
List-Help: <mailto:binutils-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: binutils-owner@sources.redhat.com
Received: (qmail 2269 invoked from network); 1 Jul 2004 22:50:04 -0000
Received: from unknown (HELO hiauly1.hia.nrc.ca) (132.246.100.193)
  by sourceware.org with SMTP; 1 Jul 2004 22:50:04 -0000
Received: from hiauly1.hia.nrc.ca (hiauly1.hia.nrc.ca [127.0.0.1] (may be forged))
	by hiauly1.hia.nrc.ca (8.12.9-20030917/8.12.9) with ESMTP id i61MnkCp010943;
	Thu, 1 Jul 2004 18:49:46 -0400 (EDT)
Received: (from dave@localhost)
	by hiauly1.hia.nrc.ca (8.12.9-20030917/8.12.9/Submit) id i61MnikF010941;
	Thu, 1 Jul 2004 18:49:44 -0400 (EDT)
Message-Id: <200407012249.i61MnikF010941@hiauly1.hia.nrc.ca>
Subject: Re: [parisc-linux] binutils 2.15?
To: amodra@bigpond.net.au (Alan Modra)
Date: Thu, 01 Jul 2004 22:50:00 -0000
From: "John David Anglin" <dave@hiauly1.hia.nrc.ca>
Cc: jakub@redhat.com, soete.joel@tiscali.be, parisc-linux@parisc-linux.org,
   binutils@sources.redhat.com
In-Reply-To: <20040614120820.GG28716@bubble.modra.org> from "Alan Modra" at Jun 14, 2004 09:38:20 pm
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-SW-Source: 2004-07/txt/msg00013.txt.bz2

> On Mon, Jun 14, 2004 at 05:25:20AM +0200, Jakub Jelinek wrote:
> > First of all, can you explain why hppa needs .got after .plt?
> 
> There's a lazy linking stub inserted at the end of the .plt section that
> loads the .got address by
> 
>   b,l	1b,%r20
>   depi	0,31,2,%r20
> 
> ie. it depends on .got immediately following these instructions.

The enclosed patch moves .plt back to where it was before Jakub's change
when NO_SMALL_DATA isn't defined.  We don't define NO_SMALL_DATA on
PA-RISC as we need support for .sbss and .sdata.

This fixes the regressions.  The alternatives look messy impacting
both gcc and glibc.

Ok?

Dave
-- 
J. David Anglin                                  dave.anglin@nrc-cnrc.gc.ca
National Research Council of Canada              (613) 990-0752 (FAX: 952-6602)

2004-07-01  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>

	* scripttempl/elf.sc: Place PLT before GOT when NO_SMALL_DATA is not
	defined.

Index: scripttempl/elf.sc
===================================================================
RCS file: /cvs/src/src/ld/scripttempl/elf.sc,v
retrieving revision 1.45
diff -u -3 -p -r1.45 elf.sc
--- scripttempl/elf.sc	15 Jun 2004 16:39:17 -0000	1.45
+++ scripttempl/elf.sc	1 Jul 2004 22:03:14 -0000
@@ -358,7 +358,7 @@ cat <<EOF
   ${RELOCATING+${DATA_SEGMENT_RELRO_END}}
   ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT-${GOT}}}}
 
-  ${DATA_PLT+${PLT}}
+  ${NO_SMALL_DATA+${DATA_PLT+${PLT}}}
 
   .data         ${RELOCATING-0} :
   {
@@ -370,6 +370,7 @@ cat <<EOF
   .data1        ${RELOCATING-0} : { *(.data1) }
   ${WRITABLE_RODATA+${RODATA}}
   ${OTHER_READWRITE_SECTIONS}
+  ${NO_SMALL_DATA-${DATA_PLT+${PLT}}}
   ${RELOCATING+${OTHER_GOT_SYMBOLS}}
   ${NO_SMALL_DATA-${GOT}}
   ${OTHER_GOT_SECTIONS}