diff options
| author | Yury Norov <ynorov@caviumnetworks.com> | 2016-12-03 18:50:43 +0530 |
|---|---|---|
| committer | Yury Norov <ynorov@caviumnetworks.com> | 2016-12-14 11:07:24 +0530 |
| commit | 6650f7bd18f8161b9f666d3e65a6346e23a9d85f (patch) | |
| tree | 74f3dc686353372f0bcd0d28ec9b2c5999680674 /bfd | |
| parent | fc8e0108db6c60f2ecefb4004cddb94e8824fd42 (diff) | |
| download | gdb-6650f7bd18f8161b9f666d3e65a6346e23a9d85f.zip gdb-6650f7bd18f8161b9f666d3e65a6346e23a9d85f.tar.gz gdb-6650f7bd18f8161b9f666d3e65a6346e23a9d85f.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
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/elfnn-aarch64.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index ffa8e6a..b05e7cf 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -5951,7 +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) { @@ -5960,7 +5962,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,8 +5984,10 @@ 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) { @@ -5987,8 +5995,12 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, 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; |