2004-05-11 17:08:38 +00:00
|
|
|
.section ".data.rel.ro", "aw", @progbits
|
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
|
|
|
/* Align, so that .got is likely at address 0x2080. */
|
|
|
|
|
.balign 4096
|
|
|
|
|
.section ".tbss", "awT", @nobits
|
|
|
|
|
bl1: .space 4
|
|
|
|
|
bl2: .space 4
|
|
|
|
|
bl3: .space 4
|
|
|
|
|
bl4: .space 4
|
|
|
|
|
bl5: .space 4
|
|
|
|
|
.text
|
|
|
|
|
/* Align, so that fn3 is likely at address 0x1000. */
|
|
|
|
|
.balign 4096
|
|
|
|
|
.globl fn3
|
|
|
|
|
.type fn3,@function
|
|
|
|
|
fn3:
|
|
|
|
|
pushl %ebp
|
|
|
|
|
movl %esp, %ebp
|
|
|
|
|
|
|
|
|
|
/* @indntpoff IE against global var */
|
|
|
|
|
movl %gs:0, %eax
|
|
|
|
|
nop;nop
|
|
|
|
|
addl sg1@indntpoff, %eax
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* @indntpoff direct %gs access IE against global var */
|
|
|
|
|
movl sg2@indntpoff, %edx
|
|
|
|
|
nop;nop
|
|
|
|
|
movl %gs:(%edx), %eax
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* @indntpoff IE against hidden var */
|
|
|
|
|
movl %gs:0, %eax
|
|
|
|
|
nop;nop
|
|
|
|
|
addl sh1@indntpoff, %eax
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* @indntpoff direct %gs access IE against hidden var */
|
|
|
|
|
movl sh2@indntpoff, %edx
|
|
|
|
|
nop;nop
|
|
|
|
|
movl %gs:(%edx), %eax
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* @indntpoff IE against local var */
|
|
|
|
|
movl %gs:0, %eax
|
|
|
|
|
nop;nop
|
|
|
|
|
addl bl1@indntpoff, %eax
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* @indntpoff direct %gs access IE against local var */
|
|
|
|
|
movl bl2@indntpoff, %edx
|
|
|
|
|
nop;nop
|
|
|
|
|
movl %gs:(%edx), %eax
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* LE @tpoff, global var */
|
|
|
|
|
movl $-3+sg3@tpoff, %edx
|
|
|
|
|
nop;nop
|
|
|
|
|
movl %gs:0, %eax
|
|
|
|
|
nop;nop
|
|
|
|
|
subl %edx, %eax
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* LE @tpoff, local var */
|
|
|
|
|
movl $-1+bl3@tpoff, %eax
|
|
|
|
|
nop;nop
|
|
|
|
|
movl %gs:0, %edx
|
|
|
|
|
nop;nop
|
|
|
|
|
subl %eax, %edx
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* LE @ntpoff, global var */
|
|
|
|
|
movl %gs:0, %eax
|
|
|
|
|
nop;nop
|
|
|
|
|
leal 2+sg4@ntpoff(%eax), %edx
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* LE @ntpoff, hidden var, non-canonical sequence */
|
|
|
|
|
movl $sh3@ntpoff, %eax
|
|
|
|
|
nop;nop
|
|
|
|
|
movl %gs:0, %edx
|
|
|
|
|
nop;nop
|
|
|
|
|
addl %eax, %edx
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* LE @ntpoff, local var, non-canonical sequence */
|
|
|
|
|
movl %gs:0, %edx
|
|
|
|
|
nop;nop
|
|
|
|
|
addl $bl4@ntpoff+1, %edx
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* Direct %gs access */
|
|
|
|
|
|
|
|
|
|
/* LE @ntpoff, global var */
|
|
|
|
|
movl %gs:sg5@ntpoff, %eax
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* LE @ntpoff, local var */
|
|
|
|
|
movl %gs:bl5@ntpoff+3, %edx
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
/* LE @ntpoff, hidden var */
|
|
|
|
|
movl %gs:1+sh4@ntpoff, %edx
|
|
|
|
|
nop;nop;nop;nop
|
|
|
|
|
|
|
|
|
|
movl -4(%ebp), %ebx
|
|
|
|
|
leave
|
|
|
|
|
ret
|