diff options
| author | Yury Norov <ynorov@caviumnetworks.com> | 2016-12-03 18:50:43 +0530 |
|---|---|---|
| committer | Yury Norov <ynorov@caviumnetworks.com> | 2016-12-14 12:00:59 +0530 |
| commit | c1fc2d7ee590f3bc87ee79c36e7216b0b6bb054b (patch) | |
| tree | 5a4a940369040820724ee0ceecd8236eb6adf441 /bfd | |
| parent | 7acd51d6971f12b832cd7281f669a7ae7feddf45 (diff) | |
| download | fsf-binutils-gdb-c1fc2d7ee590f3bc87ee79c36e7216b0b6bb054b.zip fsf-binutils-gdb-c1fc2d7ee590f3bc87ee79c36e7216b0b6bb054b.tar.gz fsf-binutils-gdb-c1fc2d7ee590f3bc87ee79c36e7216b0b6bb054b.tar.bz2 | |
ld: aarch64: fix TLS relaxation where TCB_SIZE is used
TCB_SIZE is 2*sizeof(void *), which is 0x10 for lp64, and 0x8 for
ilp32. During relaxation, ld goes to do a replace:
bl __tls_get_addr => add R0, R0, TCB_SIZE
But actual implementation is:
bfd_putl32 (0x91004000, contents + rel->r_offset + 4);
Which is equivalent of add x0, x0, 0x10. This is wrong for ilp32.
The possible fix for it is:
bfd_putl32 (0x91000000 | (TCB_SIZE<<10), contents + rel->r_offset + 4);
But ilp32 also needs w-registers, so it's simpler to put proper
instruction in #if/#else condition.
There are 2 such relaxations in elfNN_aarch64_tls_relax(), and so 2 new
tests added for ilp32 mode to test it.
Yury
* bfd/elfnn-aarch64.c: fix TLS relaxations for ilp32 where
TCB_SIZE is used.
* ld/testsuite/ld-aarch64/aarch64-elf.exp: Add tests for the case.
* ld/testsuite/ld-aarch64/tls-relax-ld-le-small-ilp32.d: New file.
* ld/testsuite/ld-aarch64/tls-relax-ld-le-tiny-ilp32.d: New file.
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfnn-aarch64.c | 20 |
2 files changed, 20 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 26d4084..21cbcac 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-12-14 Yury Norov <ynorov@caviumnetworks.com> + + * bfd/elfnn-aarch64.c: fix TLS relaxations for ilp32 where + TCB_SIZE is used. + 2016-12-13 Alan Modra <amodra@gmail.com> * elf64-hppa.c (elf64_hppa_modify_segment_map): Don't add PHDR diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index ffa8e6a..d6cc2a0 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -5951,8 +5951,9 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: /* LD->LE relaxation (tiny): adr x0, :tlsldm:x => mrs x0, tpidr_el0 - bl __tls_get_addr => add x0, x0, TCB_SIZE - */ + bl __tls_get_addr => add R0, R0, TCB_SIZE + + Where R is x for lp64 mode, and w for ilp32 mode. */ if (is_local) { BFD_ASSERT (rel->r_offset + 4 == rel[1].r_offset); @@ -5960,7 +5961,11 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, /* No need of CALL26 relocation for tls_get_addr. */ rel[1].r_info = ELFNN_R_INFO (STN_UNDEF, R_AARCH64_NONE); bfd_putl32 (0xd53bd040, contents + rel->r_offset + 0); +#if ARCH_SIZE == 64 bfd_putl32 (0x91004000, contents + rel->r_offset + 4); +#else + bfd_putl32 (0x11002000, contents + rel->r_offset + 4); +#endif return bfd_reloc_ok; } return bfd_reloc_continue; @@ -5978,17 +5983,22 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC: /* LD->LE relaxation (small): - add x0, #:tlsldm_lo12:x => add x0, x0, TCB_SIZE + add x0, #:tlsldm_lo12:x => add R0, R0, TCB_SIZE bl __tls_get_addr => nop - */ + + Where R is x for lp64 mode, and w for ilp32 mode. */ if (is_local) { BFD_ASSERT (rel->r_offset + 4 == rel[1].r_offset); BFD_ASSERT (ELFNN_R_TYPE (rel[1].r_info) == AARCH64_R (CALL26)); /* No need of CALL26 relocation for tls_get_addr. */ rel[1].r_info = ELFNN_R_INFO (STN_UNDEF, R_AARCH64_NONE); +#if ARCH_SIZE == 64 bfd_putl32 (0x91004000, contents + rel->r_offset + 0); - bfd_putl32 (0xd503201f, contents + rel->r_offset + 4); +#else + bfd_putl32 (0x11002000, contents + rel->r_offset + 0); +#endif + bfd_putl32 (INSN_NOP, contents + rel->r_offset + 4); return bfd_reloc_ok; } return bfd_reloc_continue; |