From cf4253777412e9c8d5bfbc1c8b975f472e1e7d43 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 14 Aug 2015 22:15:49 -0400 Subject: [PATCH] hppa: start.S: rework references to fix PIE TEXTRELs [BZ #18421] The startup code was not using PIC friendly references leading to TEXTRELs in every PIE ELF. --- ChangeLog | 8 ++++++++ sysdeps/hppa/start.S | 16 ++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13fccc0dc9..35cbc01509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-08-18 Alan Modra + + [BZ #18421] + * sysdeps/hppa/start.S [SHARED]: Use .section .data.rel.ro and define + .Lp__global. + (_start): Load %dp via .Lp__global. + [!SHARED]: Use .section .rodata. + 2015-08-18 Mike Frysinger * sysdeps/unix/sysv/linux/hppa/bits/timerfd.h: New file. diff --git a/sysdeps/hppa/start.S b/sysdeps/hppa/start.S index 64d8c3ed6f..cc4f243650 100644 --- a/sysdeps/hppa/start.S +++ b/sysdeps/hppa/start.S @@ -42,7 +42,11 @@ /* Have the linker create plabel words so we get PLABEL32 relocs and not 21/14. The use of 21/14 relocs is only supported in the latest dynamic linker. */ - .section .rodata +#ifdef SHARED + .section .data.rel.ro,"aw",@progbits +#else + .section .rodata,"a",@progbits +#endif .align 4 .Lpmain: .word P%main @@ -52,6 +56,10 @@ .word P%__libc_csu_fini .Lp__libc_csu_init: .word P%__libc_csu_init +#ifdef SHARED +.Lp__global: + .word $global$ +#endif .text .align 4 @@ -122,10 +130,14 @@ _start: /* void *stack_end (7th argument) */ stw %sp, -60(%sp) +#ifdef SHARED + addil LT'.Lp__global, %r19 + ldw RT'.Lp__global(%r1), %dp +#else /* load global */ ldil L%$global$, %dp ldo R%$global$(%dp), %dp - +#endif bl __libc_start_main,%r2 nop /* die horribly if it returned (it shouldn't) */