Patchwork ppc64: Fix linker script

login
register
mail settings
Submitter Andreas Färber
Date Oct. 4, 2011, 3:14 p.m.
Message ID <1317741292-28514-1-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/117650/
State New
Headers show

Comments

Andreas Färber - Oct. 4, 2011, 3:14 p.m.
Since commit 8733f609 (Fix linker scripts) linking on Linux/ppc64 fails:

  LINK  ppc64-linux-user/qemu-ppc64
/usr/lib64/gcc/powerpc64-suse-linux/4.3/../../../../powerpc64-suse-linux/bin/ld:/home/afaerber/qemu/ppc64.ld:84: syntax error
collect2: ld gab 1 als Ende-Status zurück
make[1]: *** [qemu-ppc64] Fehler 1
make: *** [subdir-ppc64-linux-user] Fehler 2

Fix by removing a leftover line in the ppc64 linker script.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 ppc64.ld |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Alexander Graf - Oct. 4, 2011, 3:17 p.m.
On 10/04/2011 05:14 PM, Andreas Färber wrote:
> Since commit 8733f609 (Fix linker scripts) linking on Linux/ppc64 fails:
>
>    LINK  ppc64-linux-user/qemu-ppc64
> /usr/lib64/gcc/powerpc64-suse-linux/4.3/../../../../powerpc64-suse-linux/bin/ld:/home/afaerber/qemu/ppc64.ld:84: syntax error
> collect2: ld gab 1 als Ende-Status zurück
> make[1]: *** [qemu-ppc64] Fehler 1
> make: *** [subdir-ppc64-linux-user] Fehler 2
>
> Fix by removing a leftover line in the ppc64 linker script.
>
> Cc: Gerd Hoffmann<kraxel@redhat.com>
> Cc: Blue Swirl<blauwirbel@gmail.com>
> Signed-off-by: Andreas Färber<afaerber@suse.de>

Thanks, applied to ppc-next.


Alex
Richard Henderson - Oct. 4, 2011, 3:35 p.m.
On 10/04/2011 08:14 AM, Andreas Färber wrote:
> Since commit 8733f609 (Fix linker scripts) linking on Linux/ppc64 fails:

It occurs to me to wonder if we ought to simply auto-detect the presence
of the -Ttext-segment ADDR option.  If that's present, don't override the
linker script and all the changes that might have been introduced therein.


r~
Alexander Graf - Oct. 5, 2011, 8:50 p.m.
On 04.10.2011, at 17:35, Richard Henderson wrote:

> On 10/04/2011 08:14 AM, Andreas Färber wrote:
>> Since commit 8733f609 (Fix linker scripts) linking on Linux/ppc64 fails:
> 
> It occurs to me to wonder if we ought to simply auto-detect the presence
> of the -Ttext-segment ADDR option.  If that's present, don't override the
> linker script and all the changes that might have been introduced therein.

I'm pretty sure that is unrelated to fixing the compile breakage :)


Alex

Patch

diff --git a/ppc64.ld b/ppc64.ld
index 0059ee5..0a7c0dd 100644
--- a/ppc64.ld
+++ b/ppc64.ld
@@ -81,8 +81,8 @@  SECTIONS
   .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) }
   .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
   .eh_frame_hdr : { *(.eh_frame_hdr) }
-*(.gcc_except_table.*) } /* Adjust the address for the data segment.  We want to
-adjust up to +     the same address within the page on the next page up.  */
+  /* Adjust the address for the data segment.  We want to adjust up to
+     the same address within the page on the next page up.  */
   . = ALIGN (0x10000) - ((0x10000 - .) & (0x10000 - 1)); . = DATA_SEGMENT_ALIGN
 (0x10000, 0x1000);   /* Exception handling  */
   .eh_frame       : { KEEP (*(.eh_frame)) }