From 0855e32bf582698d8995b7e85e144ef105d71c82 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 10 Jan 2011 08:40:19 +0000 Subject: bfd/ * 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. --- gas/testsuite/ChangeLog | 6 ++++++ gas/testsuite/gas/arm/tls.d | 48 +++++++++++++++++++++++++++++++++------------ gas/testsuite/gas/arm/tls.s | 42 ++++++++++++++++++++++++++++++--------- 3 files changed, 75 insertions(+), 21 deletions(-) (limited to 'gas/testsuite') diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 67eee86..d28da8d 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-01-10 Nathan Sidwell + Glauber de Oliveira Costa + + * gas/arm/tls.s: Add tlsdesc tests. + * gas/arm/tls.d: Adjust. + 2011-01-07 H.J. Lu * gas/i386/ilp32/x86-64-arch-2.d: Add bmi flag and BMI instruction diff --git a/gas/testsuite/gas/arm/tls.d b/gas/testsuite/gas/arm/tls.d index 6401f29..727f8e4 100644 --- a/gas/testsuite/gas/arm/tls.d +++ b/gas/testsuite/gas/arm/tls.d @@ -11,15 +11,39 @@ Disassembly of section .text: -00+0
: - 0: e1a00000 nop ; \(mov r0, r0\) - 4: e1a00000 nop ; \(mov r0, r0\) - 8: e1a0f00e mov pc, lr - c: 00000000 .word 0x00000000 - c: R_ARM_TLS_GD32 a - 10: 00000004 .word 0x00000004 - 10: R_ARM_TLS_LDM32 b - 14: 00000008 .word 0x00000008 - 14: R_ARM_TLS_IE32 c - 18: 00000000 .word 0x00000000 - 18: R_ARM_TLS_LE32 d +0+00 : + 0: e1a00000 nop ; .* + 0: R_ARM_TLS_DESCSEQ af + 4: e59f0014 ldr r0, \[pc, #20\] ; 20 .* + 8: fa000000 blx 8 + 8: R_ARM_TLS_CALL ae + c: e1a00000 nop ; .* +0+10 <.arm_pool>: + 10: 00000008 .word 0x00000008 + 10: R_ARM_TLS_GD32 aa + 14: 0000000c .word 0x0000000c + 14: R_ARM_TLS_LDM32 ab + 18: 00000010 .word 0x00000010 + 18: R_ARM_TLS_IE32 ac + 1c: 00000000 .word 0x00000000 + 1c: R_ARM_TLS_LE32 ad + 20: 00000018 .word 0x00000018 + 20: R_ARM_TLS_GOTDESC ae +0+24 : + 24: 46c0 nop ; .* + 26: 46c0 nop ; .* + 26: R_ARM_THM_TLS_DESCSEQ tf + 28: 4805 ldr r0, \[pc, #20\] ; \(40 .*\) + 2a: f000 e800 blx 4 + 2a: R_ARM_THM_TLS_CALL te + 2e: 46c0 nop ; .* + 30: 00000002 .word 0x00000002 + 30: R_ARM_TLS_GD32 ta + 34: 00000006 .word 0x00000006 + 34: R_ARM_TLS_LDM32 tb + 38: 0000000a .word 0x0000000a + 38: R_ARM_TLS_IE32 tc + 3c: 00000000 .word 0x00000000 + 3c: R_ARM_TLS_LE32 td + 40: 00000017 .word 0x00000017 + 40: R_ARM_TLS_GOTDESC te diff --git a/gas/testsuite/gas/arm/tls.s b/gas/testsuite/gas/arm/tls.s index 48722a4..96a25f5 100644 --- a/gas/testsuite/gas/arm/tls.s +++ b/gas/testsuite/gas/arm/tls.s @@ -1,14 +1,38 @@ .text - .globl main - .type main, %function -main: + .arm + .globl arm_fn + .type arm_fn, %function +arm_fn: +1: +.tlsdescseq af nop -.L2: + ldr r0, 1f +2: blx ae(tlscall) nop - mov pc, lr +.arm_pool: + .word aa(tlsgd) + (. - 1b - 8) + .word ab(tlsldm) + (. - 1b- 8) + .word ac(gottpoff) + (. - 1b - 8) + .word ad(tpoff) +1: .word ae(tlsdesc) + (. - 2b) + + .thumb + .globl thumb_fn + .type thumb_fn, %function +thumb_fn: + nop +1: +.tlsdescseq tf + nop + ldr r0, 1f +2: blx te(tlscall) + nop + + .p2align 2 .Lpool: - .word a(tlsgd) + (. - .L2 - 8) - .word b(tlsldm) + (. - .L2 - 8) - .word c(gottpoff) + (. - .L2 - 8) - .word d(tpoff) + .word ta(tlsgd) + (. - 1b - 8) + .word tb(tlsldm) + (. - 1b - 8) + .word tc(gottpoff) + (. - 1b - 8) + .word td(tpoff) +1: .word te(tlsdesc) + (. - 2b + 1) -- cgit v1.1