bfd/
* reloc.c (BFD_RELOC_386_TLS_TPOFF, BFD_RELOC_386_TLS_IE,
BFD_RELOC_386_TLS_GOTIE): Add.
* bfd-in2.h, libbfd.h: Rebuilt.
* elf32-i386.c (elf_howto_table): Add R_386_TLS_TPOFF, R_386_TLS_IE
and R_386_TLS_GOTIE.
(elf_i386_reloc_type_lookup): Handle it.
(struct elf_i386_link_hash_entry): Change tls_type type to unsigned
char instead of enum, change GOT_* into defines.
(GOT_TLS_IE_POS, GOT_TLS_IE_NEG, GOT_TLS_IE_BOTH): Define.
(elf_i386_tls_transition): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
(elf_i386_check_relocs): Likewise. Avoid crash if local symbol is
accessed both as normal and TLS symbol. Move R_386_TLS_LDM and
R_386_PLT32 cases so that R_386_TLS_IE can fall through.
Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
(elf_i386_gc_sweep_hook): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
(allocate_dynrelocs): Allocate 2 .got and 2 .rel.got entries if
tls_type is GOT_TLS_IE_BOTH.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
(elf_i386_finish_dynamic_symbol): Use tls_type & GOT_TLS_IE to catch
all 4 GOT_TLS_* TLS types.
gas/
* config/tc-i386.c (tc_i386_fix_adjustable): Handle
BFD_RELOC_386_TLS_IE and BFD_RELOC_386_TLS_GOTIE.
(BFD_RELOC_386_TLS_IE, BFD_RELOC_386_TLS_GOTIE): Define to 0
if not defined.
(lex_got): Handle @GOTNTPOFF and @INDNTPOFF.
(md_apply_fix3, tc_gen_reloc): Handle BFD_RELOC_386_TLS_IE and
BFD_RELOC_386_TLS_GOTIE.
gas/testsuite/
* gas/i386/tlspic.s: Add tests.
* gas/i386/tlspic.d: Regenerated.
* gas/i386/tlsnopic.s: Add tests.
* gas/i386/tlsnopic.d: Regenerated.
include/
* elf/i386.h (R_386_TLS_TPOFF, R_386_TLS_IE, R_386_TLS_GOTIE):
Define.
ld/testsuite/
* ld-i386/i386.exp: New.
* ld-i386/tlsbin.dd: New test.
* ld-i386/tlsbinpic.s: New test.
* ld-i386/tlsbin.rd: New test.
* ld-i386/tlsbin.s: New test.
* ld-i386/tlsbin.sd: New test.
* ld-i386/tlsbin.td: New test.
* ld-i386/tlslib.s: New test.
* ld-i386/tlsnopic1.s: New test.
* ld-i386/tlsnopic2.s: New test.
* ld-i386/tlsnopic.dd: New test.
* ld-i386/tlsnopic.rd: New test.
* ld-i386/tlsnopic.sd: New test.
* ld-i386/tlspic1.s: New test.
* ld-i386/tlspic2.s: New test.
* ld-i386/tlspic.dd: New test.
* ld-i386/tlspic.rd: New test.
* ld-i386/tlspic.sd: New test.
* ld-i386/tlspic.td: New test.
2002-09-19 19:01:18 +00:00
|
|
|
/* Force .got aligned to 4K, so it very likely gets at 0x804a100
|
|
|
|
|
(0x60 bytes .tdata and 0xa0 bytes .dynamic) */
|
|
|
|
|
.data
|
|
|
|
|
.balign 4096
|
|
|
|
|
.section ".tdata", "awT", @progbits
|
|
|
|
|
.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@tlsgd(,%ebx,1), %eax
|
|
|
|
|
call ___tls_get_addr@plt
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* GD -> IE because variable is not defined in executable where
|
|
|
|
|
the variable is referenced through @gottpoff too */
|
|
|
|
|
leal sG2@tlsgd(,%ebx,1), %eax
|
|
|
|
|
call ___tls_get_addr@plt
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* GD -> IE because variable is not defined in executable where
|
|
|
|
|
the variable is referenced through @gotntpoff too */
|
|
|
|
|
leal sG3@tlsgd(,%ebx,1), %eax
|
|
|
|
|
call ___tls_get_addr@plt
|
|
|
|
|
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@tlsgd(,%ebx,1), %eax
|
|
|
|
|
call ___tls_get_addr@plt
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* GD -> LE with global variable defined in executable */
|
|
|
|
|
leal sg1@tlsgd(,%ebx,1), %eax
|
|
|
|
|
call ___tls_get_addr@plt
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* GD -> LE with local variable defined in executable */
|
|
|
|
|
leal sl1@tlsgd(,%ebx,1), %eax
|
|
|
|
|
call ___tls_get_addr@plt
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* GD -> LE with hidden variable defined in executable */
|
|
|
|
|
leal sh1@tlsgd(,%ebx,1), %eax
|
|
|
|
|
call ___tls_get_addr@plt
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
2002-10-01 09:10:46 +00:00
|
|
|
/* LD -> LE */
|
bfd/
* reloc.c (BFD_RELOC_386_TLS_TPOFF, BFD_RELOC_386_TLS_IE,
BFD_RELOC_386_TLS_GOTIE): Add.
* bfd-in2.h, libbfd.h: Rebuilt.
* elf32-i386.c (elf_howto_table): Add R_386_TLS_TPOFF, R_386_TLS_IE
and R_386_TLS_GOTIE.
(elf_i386_reloc_type_lookup): Handle it.
(struct elf_i386_link_hash_entry): Change tls_type type to unsigned
char instead of enum, change GOT_* into defines.
(GOT_TLS_IE_POS, GOT_TLS_IE_NEG, GOT_TLS_IE_BOTH): Define.
(elf_i386_tls_transition): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
(elf_i386_check_relocs): Likewise. Avoid crash if local symbol is
accessed both as normal and TLS symbol. Move R_386_TLS_LDM and
R_386_PLT32 cases so that R_386_TLS_IE can fall through.
Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
(elf_i386_gc_sweep_hook): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
(allocate_dynrelocs): Allocate 2 .got and 2 .rel.got entries if
tls_type is GOT_TLS_IE_BOTH.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
(elf_i386_finish_dynamic_symbol): Use tls_type & GOT_TLS_IE to catch
all 4 GOT_TLS_* TLS types.
gas/
* config/tc-i386.c (tc_i386_fix_adjustable): Handle
BFD_RELOC_386_TLS_IE and BFD_RELOC_386_TLS_GOTIE.
(BFD_RELOC_386_TLS_IE, BFD_RELOC_386_TLS_GOTIE): Define to 0
if not defined.
(lex_got): Handle @GOTNTPOFF and @INDNTPOFF.
(md_apply_fix3, tc_gen_reloc): Handle BFD_RELOC_386_TLS_IE and
BFD_RELOC_386_TLS_GOTIE.
gas/testsuite/
* gas/i386/tlspic.s: Add tests.
* gas/i386/tlspic.d: Regenerated.
* gas/i386/tlsnopic.s: Add tests.
* gas/i386/tlsnopic.d: Regenerated.
include/
* elf/i386.h (R_386_TLS_TPOFF, R_386_TLS_IE, R_386_TLS_GOTIE):
Define.
ld/testsuite/
* ld-i386/i386.exp: New.
* ld-i386/tlsbin.dd: New test.
* ld-i386/tlsbinpic.s: New test.
* ld-i386/tlsbin.rd: New test.
* ld-i386/tlsbin.s: New test.
* ld-i386/tlsbin.sd: New test.
* ld-i386/tlsbin.td: New test.
* ld-i386/tlslib.s: New test.
* ld-i386/tlsnopic1.s: New test.
* ld-i386/tlsnopic2.s: New test.
* ld-i386/tlsnopic.dd: New test.
* ld-i386/tlsnopic.rd: New test.
* ld-i386/tlsnopic.sd: New test.
* ld-i386/tlspic1.s: New test.
* ld-i386/tlspic2.s: New test.
* ld-i386/tlspic.dd: New test.
* ld-i386/tlspic.rd: New test.
* ld-i386/tlspic.sd: New test.
* ld-i386/tlspic.td: New test.
2002-09-19 19:01:18 +00:00
|
|
|
leal sl1@tlsldm(%ebx), %eax
|
|
|
|
|
call ___tls_get_addr@PLT
|
|
|
|
|
nop;nop
|
|
|
|
|
leal sl1@dtpoff(%eax), %edx
|
|
|
|
|
nop;nop
|
|
|
|
|
leal sl2@dtpoff(%eax), %ecx
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
2002-10-01 09:10:46 +00:00
|
|
|
/* LD -> LE against hidden variables */
|
bfd/
* reloc.c (BFD_RELOC_386_TLS_TPOFF, BFD_RELOC_386_TLS_IE,
BFD_RELOC_386_TLS_GOTIE): Add.
* bfd-in2.h, libbfd.h: Rebuilt.
* elf32-i386.c (elf_howto_table): Add R_386_TLS_TPOFF, R_386_TLS_IE
and R_386_TLS_GOTIE.
(elf_i386_reloc_type_lookup): Handle it.
(struct elf_i386_link_hash_entry): Change tls_type type to unsigned
char instead of enum, change GOT_* into defines.
(GOT_TLS_IE_POS, GOT_TLS_IE_NEG, GOT_TLS_IE_BOTH): Define.
(elf_i386_tls_transition): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
(elf_i386_check_relocs): Likewise. Avoid crash if local symbol is
accessed both as normal and TLS symbol. Move R_386_TLS_LDM and
R_386_PLT32 cases so that R_386_TLS_IE can fall through.
Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
(elf_i386_gc_sweep_hook): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
(allocate_dynrelocs): Allocate 2 .got and 2 .rel.got entries if
tls_type is GOT_TLS_IE_BOTH.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
(elf_i386_finish_dynamic_symbol): Use tls_type & GOT_TLS_IE to catch
all 4 GOT_TLS_* TLS types.
gas/
* config/tc-i386.c (tc_i386_fix_adjustable): Handle
BFD_RELOC_386_TLS_IE and BFD_RELOC_386_TLS_GOTIE.
(BFD_RELOC_386_TLS_IE, BFD_RELOC_386_TLS_GOTIE): Define to 0
if not defined.
(lex_got): Handle @GOTNTPOFF and @INDNTPOFF.
(md_apply_fix3, tc_gen_reloc): Handle BFD_RELOC_386_TLS_IE and
BFD_RELOC_386_TLS_GOTIE.
gas/testsuite/
* gas/i386/tlspic.s: Add tests.
* gas/i386/tlspic.d: Regenerated.
* gas/i386/tlsnopic.s: Add tests.
* gas/i386/tlsnopic.d: Regenerated.
include/
* elf/i386.h (R_386_TLS_TPOFF, R_386_TLS_IE, R_386_TLS_GOTIE):
Define.
ld/testsuite/
* ld-i386/i386.exp: New.
* ld-i386/tlsbin.dd: New test.
* ld-i386/tlsbinpic.s: New test.
* ld-i386/tlsbin.rd: New test.
* ld-i386/tlsbin.s: New test.
* ld-i386/tlsbin.sd: New test.
* ld-i386/tlsbin.td: New test.
* ld-i386/tlslib.s: New test.
* ld-i386/tlsnopic1.s: New test.
* ld-i386/tlsnopic2.s: New test.
* ld-i386/tlsnopic.dd: New test.
* ld-i386/tlsnopic.rd: New test.
* ld-i386/tlsnopic.sd: New test.
* ld-i386/tlspic1.s: New test.
* ld-i386/tlspic2.s: New test.
* ld-i386/tlspic.dd: New test.
* ld-i386/tlspic.rd: New test.
* ld-i386/tlspic.sd: New test.
* ld-i386/tlspic.td: New test.
2002-09-19 19:01:18 +00:00
|
|
|
leal sh1@tlsldm(%ebx), %eax
|
|
|
|
|
call ___tls_get_addr@PLT
|
|
|
|
|
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
|