0855e32bf5
* reloc.c (BFD_RELOC_ARM_TLS_GOTDESC, BFD_RELOC_ARM_TLS_CALL, BFD_RELOC_ARM_THM_TLS_CALL, BFD_RELOC_ARM_TLS_DESCSEQ, BFD_RELOC_ARM_THM_TLS_DESCSEQ, BFD_RELOC_ARM_TLS_DESC): New relocations. * libbfd.h: Rebuilt. * bfd-in2.h: Rebuilt. * elf32-arm.c (elf32_arm_howto_table_1): Add new relocations. (elf32_arm_reloc_map): Likewise. (tls_trampoline, dl_tlsdesc_lazy_trampoline): New PLT templates. (elf32_arm_stub_long_branch_any_tls_pic, elf32_arm_stub_long_branch_v4t_thumb_tls_pic): New stub templates. (DEF_STUBS): Add new stubs. (struct_elf_arm_obj_data): Add local_tlsdesc_gotent field. (elf32_arm_local_tlsdesc_gotent): New. (GOT_TLS_GDESC): New mask. (GOT_TLS_GD_ANY): Define. (struct elf32_arm_link_hash_entry): Add tlsdesc_got field. (elf32_arm_compute_jump_table_size): New. (struct elf32_arm_link_hash_table): Add next_tls_desc_index, num_tls_desc, dt_tlsdesc_plt, dt_tlsdesc_got, tls_trampoline, sgotplt_jump_table_size fields. (elf32_arm_link_hash_newfunc): Initialize tlsdesc_got field. (elf32_arm_link_hash_table_create): Initialize new fields. (arm_type_of_stub): Check TLS desc relocs too. (elf32_arm_stub_name): TLS desc relocs can be shared. (elf32_arm_tls_transition): Determine relaxation. (arm_stub_required_alignment): Add tls stubs. (elf32_arm_size_stubs): Likewise. (elf32_arm_tls_relax): Perform TLS relaxing. (elf32_arm_final_link_relocate): Process TLS DESC relocations. (IS_ARM_TLS_GNU_RELOC): New. (IS_ARM_TLS_RELOC): Use it. (elf32_arm_relocate_section): Perform TLS relaxing. (elf32_arm_check_relocs): Anticipate TLS relaxing, process tls desc relocations. (allocate_dynrelocs): Allocate tls desc relcoations. (elf32_arm_output_arch_local_syms): Emit tls trampoline mapping symbols. (elf32_arm_size_dynamic_sections): Allocate tls trampolines and got slots. (elf32_arm_always_size_sections): New. Create _TLS_MODULE_BASE symbol. (elf32_arm_finish_dynamic_symbol): Adjust. (arm_put_trampoline): New. (elf32_arm_finish_dynamic_sections): Emit new dynamic tags and tls trampolines. (elf_backend_always_size_sections): Define. include/elf/ * arm.h (R_ARM_TLS_DESC, R_ARM_TLS_GOTDESC, R_ARM_TLS_CALL, R_ARM_TLS_DESCSEQ, T_ARM_THM_TLS_CALL, R_ARM_THM_TLS_DESCSEQ): New relocations. gas/ * doc/c-arm.texi: Document TLSDESC and TLSCALL relocations, and .tlsdescseq directive. * config/tc-arm.c (arm_typed_reg_parse): Check for potential reloc following a symbol. (s_arm_tls_descseq): New directive. (md_pseudo_table): Add it. (encode_branch): Allow TLS_CALL relocs too. (do_t_blx, do_t_branch23): Use encode_branch. (reloc_names): Add tlsdesc and tlscall. (md_apply_fix): Process tls desc relocations. (tc_gen_reloc): Likewise. (arm_fix_adjustable): Likewise. gas/testsuite/ * gas/arm/tls.s: Add tlsdesc tests. * gas/arm/tls.d: Adjust. ld/testsuite/ * ld-arm/arm-elf.exp: Added tests for new TLS handling relocations. * ld-arm/tls-descrelax-be32.d: New. * ld-arm/tls-descrelax-be32.s: New. * ld-arm/tls-descrelax-be8.d: New. * ld-arm/tls-descrelax-be8.s: New. * ld-arm/tls-descrelax-v7.d: New. * ld-arm/tls-descrelax-v7.s: New. * ld-arm/tls-descrelax.d: New. * ld-arm/tls-descrelax.s: New. * ld-arm/tls-descseq.d: New. * ld-arm/tls-descseq.r: New. * ld-arm/tls-descseq.s: New. * ld-arm/tls-gdesc-got.d: New. * ld-arm/tls-gdesc-got.s: New. * ld-arm/tls-gdesc-nlazy.g: New. * ld-arm/tls-gdesc-nlazy.s: New. * ld-arm/tls-gdesc.d: New. * ld-arm/tls-gdesc.r: New. * ld-arm/tls-gdesc.s: New. * ld-arm/tls-gdierelax.d: New. * ld-arm/tls-gdierelax.s: New. * ld-arm/tls-gdierelax2.d: New. * ld-arm/tls-gdierelax2.s: New. * ld-arm/tls-gdlerelax.d: New. * ld-arm/tls-gdlerelax.s: New. * ld-arm/tls-lib-loc.d: New. * ld-arm/tls-lib-loc.r: New. * ld-arm/tls-lib-loc.s: New. * ld-arm/tls-longplt-lib.d: New. * ld-arm/tls-longplt-lib.s: New. * ld-arm/tls-longplt.d: New. * ld-arm/tls-longplt.s: New. * ld-arm/tls-mixed.r: New. * ld-arm/tls-mixed.s: New. * ld-arm/tls-thumb1.d: New. * ld-arm/tls-thumb1.s: New. * ld-arm/arm-elf.exp: New.
198 lines
2.8 KiB
ArmAsm
198 lines
2.8 KiB
ArmAsm
@ we can relax local and non-weak globals for non-shared links
|
|
|
|
.arch armv7-a
|
|
.text
|
|
.arm
|
|
|
|
.p2align 2
|
|
foo:
|
|
@tlscall global, manually relaxed to IE
|
|
ldr r0, 1f
|
|
2: ldr r0, [pc, r0]
|
|
nop
|
|
.p2align 2
|
|
1: .word gd1(gottpoff) + (. - 2b - 8)
|
|
|
|
.p2align 2
|
|
@tlscall global, should relax to IE
|
|
ldr r0, 1f
|
|
2: blx gd1(tlscall)
|
|
nop
|
|
.p2align 2
|
|
1: .word gd1(tlsdesc) + (. - 2b)
|
|
|
|
.p2align 2
|
|
@tlscall local, manually relaxed to LE
|
|
ldr r0, 1f
|
|
nop
|
|
nop
|
|
.p2align 2
|
|
1: .word ld1(tpoff)
|
|
|
|
.p2align 2
|
|
@tlscall local, should relax to LE
|
|
ldr r0, 1f
|
|
2: blx ld1(tlscall)
|
|
nop
|
|
.p2align 2
|
|
1: .word ld1(tlsdesc) + (. - 2b)
|
|
|
|
.p2align 2
|
|
@open coded global, manually relaxed to IE
|
|
ldr r0, 1f
|
|
2:
|
|
add r0, pc, r0
|
|
ldr r1, [r0]
|
|
mov r0, r1
|
|
nop
|
|
.p2align 2
|
|
1: .word gd1(gottpoff) + (. - 2b - 8)
|
|
|
|
.p2align 2
|
|
@open coded global, should relax to IE
|
|
ldr r0, 1f
|
|
2:
|
|
.tlsdescseq gd1
|
|
add r0, pc, r0
|
|
.tlsdescseq gd1
|
|
ldr r1, [r0,#4]
|
|
.tlsdescseq gd1
|
|
blx r1
|
|
nop
|
|
.p2align 2
|
|
1: .word gd1(tlsdesc) + (. - 2b)
|
|
|
|
.p2align 2
|
|
@open coded local, manually relaxed to LE
|
|
ldr r0, 1f
|
|
2:
|
|
nop
|
|
nop
|
|
nop
|
|
nop
|
|
.p2align 2
|
|
1: .word ld1(tpoff)
|
|
|
|
.p2align 2
|
|
@open coded local, should relax to LE
|
|
ldr r0, 1f
|
|
2:
|
|
.tlsdescseq ld1
|
|
add r0, pc, r0
|
|
.tlsdescseq ld1
|
|
ldr r1, [r0,#4]
|
|
.tlsdescseq ld1
|
|
blx r1
|
|
nop
|
|
.p2align 2
|
|
1: .word ld1(tlsdesc) + (. - 2b)
|
|
|
|
|
|
.thumb
|
|
.p2align 1
|
|
bar:
|
|
@tlscall global, manually relaxed to IE
|
|
ldr r0, 1f
|
|
2: add r0, pc, r0
|
|
ldr r0, [r0]
|
|
nop
|
|
.p2align 2
|
|
1: .word gd1(gottpoff) + (. - 2b - 4)
|
|
|
|
.p2align 1
|
|
@tlscall global, should relax to IE
|
|
ldr r0, 1f
|
|
2: blx gd1(tlscall)
|
|
nop
|
|
.p2align 2
|
|
1: .word gd1(tlsdesc) + (. - 2b + 1)
|
|
|
|
.p2align 1
|
|
@tlscall global, should relax to IE
|
|
ldr r0, 1f
|
|
2: blx r1(tlscall)
|
|
nop
|
|
.p2align 2
|
|
1: .word r1(tlsdesc) + (. - 2b + 1)
|
|
|
|
.p2align 1
|
|
@tlscall local, manually relaxed to LE
|
|
ldr r0, 1f
|
|
nop
|
|
nop
|
|
.p2align 2
|
|
1: .word ld1(tpoff)
|
|
|
|
.p2align 1
|
|
@tlscall local, should relax to LE
|
|
ldr r0, 1f
|
|
2: blx ld1(tlscall)
|
|
nop
|
|
.p2align 2
|
|
1: .word ld1(tlsdesc) + (. - 2b + 1)
|
|
|
|
.p2align 1
|
|
@tlscall local, should relax to LE
|
|
ldr r0, 1f
|
|
2: blx r0(tlscall)
|
|
nop
|
|
.p2align 2
|
|
1: .word r0(tlsdesc) + (. - 2b + 1)
|
|
|
|
.p2align 1
|
|
@open coded global, manually relaxed to IE
|
|
ldr r0, 1f
|
|
2:
|
|
add r0, pc
|
|
ldr r1, [r0]
|
|
mov r0, r1
|
|
nop
|
|
.p2align 2
|
|
1: .word gd1(gottpoff) + (. - 2b - 4)
|
|
|
|
.p2align 1
|
|
@open coded global, should relax to IE
|
|
ldr r0, 1f
|
|
2:
|
|
.tlsdescseq gd1
|
|
add r0, pc
|
|
.tlsdescseq gd1
|
|
ldr r1, [r0,#4]
|
|
.tlsdescseq gd1
|
|
blx r1
|
|
nop
|
|
.p2align 2
|
|
1: .word gd1(tlsdesc) + (. - 2b + 1)
|
|
|
|
.p2align 1
|
|
@open coded local, manually relaxed to LE
|
|
ldr r0, 1f
|
|
2:
|
|
nop
|
|
nop
|
|
nop
|
|
nop
|
|
.p2align 2
|
|
1: .word ld1(tpoff)
|
|
|
|
.p2align 1
|
|
@open coded local, should relax to LE
|
|
ldr r0, 1f
|
|
2:
|
|
.tlsdescseq ld1
|
|
add r0, pc
|
|
.tlsdescseq ld1
|
|
ldr r1, [r0,#4]
|
|
.tlsdescseq ld1
|
|
blx r1
|
|
nop
|
|
.p2align 2
|
|
1: .word ld1(tlsdesc) + (. - 2b + 1)
|
|
|
|
.section .tdata,"awT"
|
|
.global gd1
|
|
gd1: .space 4
|
|
ld1: .space 4
|
|
.globl r1
|
|
r1: .space 4
|
|
r0: .space 4
|