67a4f2b710
Introduce TLS descriptors for i386 and x86_64. * common.h (DT_TLSDESC_GOT, DT_TLSDESC_PLT): New. * i386.h (R_386_TLS_GOTDESC, R_386_TLS_DESC_CALL, R_386_TLS_DESC): New. * x86-64.h (R_X86_64_GOTPC32_TLSDESC, R_X86_64_TLSDESC_CALL, R_X86_64_TLSDESC): New. bfd/ChangeLog: Introduce TLS descriptors for i386 and x86_64. * reloc.c (BFD_RELOC_386_TLS_GOTDESC, BFD_RELOC_386_TLS_DESC, BFD_RELOC_386_TLS_DESC_CALL, BFD_RELOC_X86_64_GOTPC32_TLSDESC, BFD_RELOC_X86_64_TLSDESC, BFD_RELOC_X86_64_TLSDESC_CALL): New. * libbfd.h, bfd-in2.h: Rebuilt. * elf32-i386.c (elf_howto_table): New relocations. (R_386_tls): Adjust. (elf_i386_reloc_type_lookup): Map new relocations. (GOT_TLS_GDESC, GOT_TLS_GD_BOTH_P): New macros. (GOT_TLS_GD_P, GOT_TLS_GDESC_P, GOT_TLS_GD_ANY_P): New macros. (struct elf_i386_link_hash_entry): Add tlsdesc_got field. (struct elf_i386_obj_tdata): Add local_tlsdesc_gotent field. (elf_i386_local_tlsdesc_gotent): New macro. (struct elf_i386_link_hash_table): Add sgotplt_jump_table_size. (elf_i386_compute_jump_table_size): New macro. (link_hash_newfunc): Initialize tlsdesc_got. (elf_i386_link_hash_table_create): Set sgotplt_jump_table_size. (elf_i386_tls_transition): Handle R_386_TLS_GOTDESC and R_386_TLS_DESC_CALL. (elf_i386_check_relocs): Likewise. Allocate space for local_tlsdesc_gotent. (elf_i386_gc_sweep_hook): Handle R_386_TLS_GOTDESC and R_386_TLS_DESC_CALL. (allocate_dynrelocs): Count function PLT relocations. Reserve space for TLS descriptors and relocations. (elf_i386_size_dynamic_sections): Reserve space for TLS descriptors and relocations. Set up sgotplt_jump_table_size. Don't zero reloc_count in srelplt. (elf_i386_always_size_sections): New. Set up _TLS_MODULE_BASE_. (elf_i386_relocate_section): Handle R_386_TLS_GOTDESC and R_386_TLS_DESC_CALL. (elf_i386_finish_dynamic_symbol): Use GOT_TLS_GD_ANY_P. (elf_backend_always_size_sections): Define. * elf64-x86-64.c (x86_64_elf_howto): Add R_X86_64_GOTPC32_TLSDESC, R_X86_64_TLSDESC, R_X86_64_TLSDESC_CALL. (R_X86_64_standard): Adjust. (x86_64_reloc_map): Map new relocs. (elf64_x86_64_rtype_to_howto): New, split out of... (elf64_x86_64_info_to_howto): ... this function, and... (elf64_x86_64_reloc_type_lookup): ... use it to map elf_reloc_val. (GOT_TLS_GDESC, GOT_TLS_GD_BOTH_P): New macros. (GOT_TLS_GD_P, GOT_TLS_GDESC_P, GOT_TLS_GD_ANY_P): New macros. (struct elf64_x86_64_link_hash_entry): Add tlsdesc_got field. (struct elf64_x86_64_obj_tdata): Add local_tlsdesc_gotent field. (elf64_x86_64_local_tlsdesc_gotent): New macro. (struct elf64_x86_64_link_hash_table): Add tlsdesc_plt, tlsdesc_got and sgotplt_jump_table_size fields. (elf64_x86_64_compute_jump_table_size): New macro. (link_hash_newfunc): Initialize tlsdesc_got. (elf64_x86_64_link_hash_table_create): Initialize new fields. (elf64_x86_64_tls_transition): Handle R_X86_64_GOTPC32_TLSDESC and R_X86_64_TLSDESC_CALL. (elf64_x86_64_check_relocs): Likewise. Allocate space for local_tlsdesc_gotent. (elf64_x86_64_gc_sweep_hook): Handle R_X86_64_GOTPC32_TLSDESC and R_X86_64_TLSDESC_CALL. (allocate_dynrelocs): Count function PLT relocations. Reserve space for TLS descriptors and relocations. (elf64_x86_64_size_dynamic_sections): Reserve space for TLS descriptors and relocations. Set up sgotplt_jump_table_size, tlsdesc_plt and tlsdesc_got. Make room for them. Don't zero reloc_count in srelplt. Add dynamic entries for DT_TLSDESC_PLT and DT_TLSDESC_GOT. (elf64_x86_64_always_size_sections): New. Set up _TLS_MODULE_BASE_. (elf64_x86_64_relocate_section): Handle R_386_TLS_GOTDESC and R_386_TLS_DESC_CALL. (elf64_x86_64_finish_dynamic_symbol): Use GOT_TLS_GD_ANY_P. (elf64_x86_64_finish_dynamic_sections): Set DT_TLSDESC_PLT and DT_TLSDESC_GOT. Set up TLS descriptor lazy resolver PLT entry. (elf_backend_always_size_sections): Define. binutils/ChangeLog: Introduce TLS descriptors for i386 and x86_64. * readelf.c (get_dynamic_type): Handle DT_TLSDESC_GOT and DT_TLSDESC_PLT. gas/ChangeLog: Introduce TLS descriptors for i386 and x86_64. * config/tc-i386.c (tc_i386_fix_adjustable): Handle BFD_RELOC_386_TLS_GOTDESC, BFD_RELOC_386_TLS_DESC_CALL, BFD_RELOC_X86_64_GOTPC32_TLSDESC, BFD_RELOC_X86_64_TLSDESC_CALL. (optimize_disp): Emit fix up for BFD_RELOC_386_TLS_DESC_CALL and BFD_RELOC_X86_64_TLSDESC_CALL immediately, and clear the displacement bits. (build_modrm_byte): Set up zero modrm for TLS desc calls. (lex_got): Handle @tlsdesc and @tlscall. (md_apply_fix, tc_gen_reloc): Handle the new relocations. ld/testsuite/ChangeLog: Introduce TLS descriptors for i386 and x86_64. * ld-i386/i386.exp: Run on x86_64-*-linux* and amd64-*-linux*. Add new tests. * ld-i386/pcrel16.d: Add -melf_i386. * ld-i386/pcrel8.d: Likewise. * ld-i386/tlsbindesc.dd: New. * ld-i386/tlsbindesc.rd: New. * ld-i386/tlsbindesc.s: New. * ld-i386/tlsbindesc.sd: New. * ld-i386/tlsbindesc.td: New. * ld-i386/tlsdesc.dd: New. * ld-i386/tlsdesc.rd: New. * ld-i386/tlsdesc.s: New. * ld-i386/tlsdesc.sd: New. * ld-i386/tlsdesc.td: New. * ld-i386/tlsgdesc.dd: New. * ld-i386/tlsgdesc.rd: New. * ld-i386/tlsgdesc.s: New. * ld-x86-64/x86-64.exp: Run new tests. * ld-x86-64/tlsbindesc.dd: New. * ld-x86-64/tlsbindesc.rd: New. * ld-x86-64/tlsbindesc.s: New. * ld-x86-64/tlsbindesc.sd: New. * ld-x86-64/tlsbindesc.td: New. * ld-x86-64/tlsdesc.dd: New. * ld-x86-64/tlsdesc.pd: New. * ld-x86-64/tlsdesc.rd: New. * ld-x86-64/tlsdesc.s: New. * ld-x86-64/tlsdesc.sd: New. * ld-x86-64/tlsdesc.td: New. * ld-x86-64/tlsgdesc.dd: New. * ld-x86-64/tlsgdesc.rd: New. * ld-x86-64/tlsgdesc.s: New.
168 lines
3.7 KiB
ArmAsm
168 lines
3.7 KiB
ArmAsm
/* Force .got aligned to 4K, so it very likely gets at 0x804a100
|
|
(0x60 bytes .tdata and 0xa0 bytes .dynamic) */
|
|
.section ".tdata", "awT", @progbits
|
|
.balign 4096
|
|
.globl sg1, sg2, sg3, sg4, sg5, sg6, sg7, sg8
|
|
.globl sh1, sh2, sh3, sh4, sh5, sh6, sh7, sh8
|
|
.hidden sh1, sh2, sh3, sh4, sh5, sh6, sh7, sh8
|
|
sg1: .long 17
|
|
sg2: .long 18
|
|
sg3: .long 19
|
|
sg4: .long 20
|
|
sg5: .long 21
|
|
sg6: .long 22
|
|
sg7: .long 23
|
|
sg8: .long 24
|
|
sl1: .long 65
|
|
sl2: .long 66
|
|
sl3: .long 67
|
|
sl4: .long 68
|
|
sl5: .long 69
|
|
sl6: .long 70
|
|
sl7: .long 71
|
|
sl8: .long 72
|
|
sh1: .long 257
|
|
sh2: .long 258
|
|
sh3: .long 259
|
|
sh4: .long 260
|
|
sh5: .long 261
|
|
sh6: .long 262
|
|
sh7: .long 263
|
|
sh8: .long 264
|
|
/* Force .text aligned to 4K, so it very likely gets at 0x8049000. */
|
|
.text
|
|
.balign 4096
|
|
.globl fn2
|
|
.type fn2,@function
|
|
fn2:
|
|
pushl %ebp
|
|
movl %esp, %ebp
|
|
pushl %ebx
|
|
pushl %eax
|
|
call 1f
|
|
1: popl %ebx
|
|
addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> IE because variable is not defined in executable */
|
|
leal sG1@tlsdesc(%ebx), %eax
|
|
call *sG1@tlscall(%eax)
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> IE because variable is not defined in executable where
|
|
the variable is referenced through @gottpoff too */
|
|
leal sG2@tlsdesc(%ebx), %eax
|
|
call *sG2@tlscall(%eax)
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> IE because variable is not defined in executable where
|
|
the variable is referenced through @gotntpoff too */
|
|
leal sG3@tlsdesc(%ebx), %eax
|
|
call *sG3@tlscall(%eax)
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> IE because variable is not defined in executable where
|
|
the variable is referenced through @gottpoff and @gotntpoff too */
|
|
leal sG4@tlsdesc(%ebx), %eax
|
|
call *sG4@tlscall(%eax)
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> LE with global variable defined in executable */
|
|
leal sg1@tlsdesc(%ebx), %eax
|
|
call *sg1@tlscall(%eax)
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> LE with local variable defined in executable */
|
|
leal sl1@tlsdesc(%ebx), %eax
|
|
call *sl1@tlscall(%eax)
|
|
nop;nop;nop;nop
|
|
|
|
/* GD -> LE with hidden variable defined in executable */
|
|
leal sh1@tlsdesc(%ebx), %eax
|
|
call *sh1@tlscall(%eax)
|
|
nop;nop;nop;nop
|
|
|
|
/* LD -> LE */
|
|
leal _TLS_MODULE_BASE_@tlsdesc(%ebx), %eax
|
|
call *_TLS_MODULE_BASE_@tlscall(%eax)
|
|
nop;nop
|
|
leal sl1@dtpoff(%eax), %edx
|
|
nop;nop
|
|
leal sl2@dtpoff(%eax), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* LD -> LE against hidden variables */
|
|
leal _TLS_MODULE_BASE_@tlsdesc(%ebx), %eax
|
|
call *_TLS_MODULE_BASE_@tlscall(%eax)
|
|
nop;nop
|
|
leal sh1@dtpoff(%eax), %edx
|
|
nop;nop
|
|
leal sh2@dtpoff(%eax), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gottpoff IE against global var */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
subl sG2@gottpoff(%ebx), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gottpoff IE against global var */
|
|
movl %gs:0, %eax
|
|
nop;nop
|
|
subl sG4@gottpoff(%ebx), %eax
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE against global var */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
addl sG3@gotntpoff(%ebx), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE against global var */
|
|
movl %gs:0, %eax
|
|
nop;nop
|
|
addl sG4@gotntpoff(%ebx), %eax
|
|
nop;nop;nop;nop
|
|
|
|
/* @gottpoff IE -> LE against global var defined in exec */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
subl sg1@gottpoff(%ebx), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE -> LE against local var */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
addl sl1@gotntpoff(%ebx), %eax
|
|
nop;nop;nop;nop
|
|
|
|
/* @gottpoff IE -> LE against hidden var */
|
|
movl %gs:0, %ecx
|
|
nop;nop
|
|
subl sh1@gottpoff(%ebx), %ecx
|
|
nop;nop;nop;nop
|
|
|
|
/* Direct access through %gs */
|
|
|
|
/* @gotntpoff IE against global var */
|
|
movl sG5@gotntpoff(%ebx), %ecx
|
|
nop;nop
|
|
movl %gs:(%ecx), %edx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE->LE against local var */
|
|
movl sl5@gotntpoff(%ebx), %eax
|
|
nop;nop
|
|
movl %gs:(%eax), %edx
|
|
nop;nop;nop;nop
|
|
|
|
/* @gotntpoff IE->LE against hidden var */
|
|
movl sh5@gotntpoff(%ebx), %edx
|
|
nop;nop
|
|
movl %gs:(%edx), %edx
|
|
nop;nop;nop;nop
|
|
|
|
movl -4(%ebp), %ebx
|
|
leave
|
|
ret
|