diff options
| author | Renlin Li <renlin.li@arm.com> | 2015-10-02 17:22:36 +0100 |
|---|---|---|
| committer | Renlin Li <renlin.li@arm.com> | 2015-10-02 17:56:09 +0100 |
| commit | ac734732481451698ee23990aaa64907e56dd082 (patch) | |
| tree | 22387bf9cc94b8cbb190e1b08e20ee4d954b2dd0 /bfd | |
| parent | b7a944fea3a0194d81f6de4d958f3a1d2c6ad03a (diff) | |
| download | gdb-ac734732481451698ee23990aaa64907e56dd082.zip gdb-ac734732481451698ee23990aaa64907e56dd082.tar.gz gdb-ac734732481451698ee23990aaa64907e56dd082.tar.bz2 | |
[BFD][AARCH64]Add TLSGD relaxation support under large memory model.
bfd/
2015-10-02 Renlin Li <renlin.li@arm.com>
* elfnn-aarch64.c(IS_AARCH64_TLS_RELAX_RELOC):
Add relaxation support for TLSGD_MOVW_G0_NC and TLSGD_MOVW_G1.
(aarch64_tls_transition_without_check): Likewise
(elfNN_aarch64_tls_relax): Likwise.
ld/testsuite/
2015-10-02 Renlin Li <renlin.li@arm.com>
* ld-aarch64/aarch64-elf.exp: run new test
* ld-aarch64/tls-relax-large-gd-ie.d: New.
* ld-aarch64/tls-relax-large-gd-ie.s: New.
* ld-aarch64/tls-relax-large-gd-le.d: New.
* ld-aarch64/tls-relax-large-gd-le.s: New.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elfnn-aarch64.c | 60 |
2 files changed, 67 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ecf5d56..bad620e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,12 @@ 2015-10-02 Renlin Li <renlin.li@arm.com> + * elfnn-aarch64.c(IS_AARCH64_TLS_RELAX_RELOC): + Add relaxation support for TLSGD_MOVW_G0_NC and TLSGD_MOVW_G1. + (aarch64_tls_transition_without_check): Likewise + (elfNN_aarch64_tls_relax): Likwise. + +2015-10-02 Renlin Li <renlin.li@arm.com> + * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Create GOT section for TLSLE_MOVW_TPREL_G(1, 1_NC, 2) relocation. diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index d71a76f..cff77ce 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -218,6 +218,8 @@ || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADR_PREL21 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_MOVW_G1 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LDNN_GOTTPREL_LO12_NC \ @@ -4460,6 +4462,18 @@ aarch64_tls_transition_without_check (bfd_reloc_code_real_type r_type, case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: return is_local ? BFD_RELOC_AARCH64_NONE : r_type; +#if ARCH_SIZE == 64 + case BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC: + return is_local + ? BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1_NC + : BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC; + + case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: + return is_local + ? BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G2 + : BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G1; +#endif + default: break; } @@ -5692,6 +5706,52 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, return bfd_reloc_continue; } +#if ARCH_SIZE == 64 + case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: + BFD_ASSERT (ELFNN_R_TYPE (rel[1].r_info) == AARCH64_R (TLSGD_MOVW_G0_NC)); + BFD_ASSERT (rel->r_offset + 12 == rel[2].r_offset); + BFD_ASSERT (ELFNN_R_TYPE (rel[2].r_info) == AARCH64_R (CALL26)); + + if (is_local) + { + /* Large GD->LE relaxation: + movz x0, #:tlsgd_g1:var => movz x0, #:tprel_g2:var, lsl #32 + movk x0, #:tlsgd_g0_nc:var => movk x0, #:tprel_g1_nc:var, lsl #16 + add x0, gp, x0 => movk x0, #:tprel_g0_nc:var + bl __tls_get_addr => mrs x1, tpidr_el0 + nop => add x0, x0, x1 + */ + rel[2].r_info = ELFNN_R_INFO (ELFNN_R_SYM (rel->r_info), + AARCH64_R (TLSLE_MOVW_TPREL_G0_NC)); + rel[2].r_offset = rel->r_offset + 8; + + bfd_putl32 (0xd2c00000, contents + rel->r_offset + 0); + bfd_putl32 (0xf2a00000, contents + rel->r_offset + 4); + bfd_putl32 (0xf2800000, contents + rel->r_offset + 8); + bfd_putl32 (0xd53bd041, contents + rel->r_offset + 12); + bfd_putl32 (0x8b000020, contents + rel->r_offset + 16); + } + else + { + /* Large GD->IE relaxation: + movz x0, #:tlsgd_g1:var => movz x0, #:gottprel_g1:var, lsl #16 + movk x0, #:tlsgd_g0_nc:var => movk x0, #:gottprel_g0_nc:var + add x0, gp, x0 => ldr x0, [gp, x0] + bl __tls_get_addr => mrs x1, tpidr_el0 + nop => add x0, x0, x1 + */ + rel[2].r_info = ELFNN_R_INFO (STN_UNDEF, R_AARCH64_NONE); + bfd_putl32 (0xd2a80000, contents + rel->r_offset + 0); + bfd_putl32 (0x58000000, contents + rel->r_offset + 8); + bfd_putl32 (0xd53bd041, contents + rel->r_offset + 12); + bfd_putl32 (0x8b000020, contents + rel->r_offset + 16); + } + return bfd_reloc_continue; + + case BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC: + return bfd_reloc_continue; +#endif + case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19: return bfd_reloc_continue; |