Support i386 TLS code sequences without PLT
We can generate i386 TLS code sequences for general and local dynamic
models without PLT, which uses indirect call via GOT:
call *___tls_get_addr@GOT(%reg)
where EBX register isn't required as GOT base, instead of direct call:
call ___tls_get_addr[@PLT]
which requires EBX register as GOT base.
Since direct call is 4-byte long and indirect call, is 5-byte long, the
extra one byte must be handled properly.
For general dynamic model, 7-byte lea instruction before call instruction
is replaced by 6-byte one to make room for indirect call. For local
dynamic model, we simply use 5-byte indirect call.
TLS linker optimization is updated to recognize new instruction patterns.
For local dynamic model to local exec model transition, we generate
a 6-byte lea instruction as nop, instead of a 1-byte nop plus a 4-byte
lea instruction. Since linker may convert
call ___tls_get_addr[@PLT]
to
addr32 call ____tls_get_addr
when producing static executable, both patterns are recognized.
bfd/
* elf64-i386.c (elf_i386_link_hash_entry): Add tls_get_addr.
(elf_i386_link_hash_newfunc): Initialize tls_get_addr to 2.
(elf_i386_check_tls_transition): Check indirect call and direct
call with the addr32 prefix for general and local dynamic models.
Set the tls_get_addr feild.
(elf_i386_convert_load_reloc): Always use addr32 prefix for
indirect ___tls_get_addr call via GOT.
(elf_i386_relocate_section): Handle GD->LE, GD->IE and LD->LE
transitions with indirect call and direct call with the addr32
prefix.
ld/
* testsuite/ld-i386/i386.exp: Run libtlspic2.so, tlsbin2,
tlsgd3, tlsld2, tlsgd4, tlspie3a, tlspie3b and tlspie3c.
* testsuite/ld-i386/pass.out: New file.
* testsuite/ld-i386/tls-def1.c: Likewise.
* testsuite/ld-i386/tls-gd1.S: Likewise.
* testsuite/ld-i386/tls-ld1.S: Likewise.
* testsuite/ld-i386/tls-main1.c: Likewise.
* testsuite/ld-i386/tls.exp: Likewise.
* testsuite/ld-i386/tlsbin2-nacl.rd: Likewise.
* testsuite/ld-i386/tlsbin2.dd: Likewise.
* testsuite/ld-i386/tlsbin2.rd: Likewise.
* testsuite/ld-i386/tlsbin2.sd: Likewise.
* testsuite/ld-i386/tlsbin2.td: Likewise.
* testsuite/ld-i386/tlsbinpic2.s: Likewise.
* testsuite/ld-i386/tlsgd3.dd: Likewise.
* testsuite/ld-i386/tlsgd3.s: Likewise.
* testsuite/ld-i386/tlsgd4.d: Likewise.
* testsuite/ld-i386/tlsgd4.s: Likewise.
* testsuite/ld-i386/tlsld2.s: Likewise.
* testsuite/ld-i386/tlspic2-nacl.rd: Likewise.
* testsuite/ld-i386/tlspic2.dd: Likewise.
* testsuite/ld-i386/tlspic2.rd: Likewise.
* testsuite/ld-i386/tlspic2.sd: Likewise.
* testsuite/ld-i386/tlspic2.td: Likewise.
* testsuite/ld-i386/tlspic3.s: Likewise.
* testsuite/ld-i386/tlspie3.s: Likewise.
* testsuite/ld-i386/tlspie3a.d: Likewise.
* testsuite/ld-i386/tlspie3b.d: Likewise.
* testsuite/ld-i386/tlspie3c.d: Likewise.
2016-06-09 02:59:47 +08:00
|
|
|
#source: tlsbinpic2.s
|
|
|
|
#source: tlsbin.s
|
|
|
|
#as: --32
|
|
|
|
#ld: -melf_i386_nacl tmpdir/libtlslib.so --no-ld-generated-unwind-info
|
|
|
|
#readelf: -Ssrl
|
|
|
|
#target: i?86-*-nacl*
|
|
|
|
|
|
|
|
There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
|
|
|
|
|
|
|
|
Section Headers:
|
|
|
|
+\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
|
|
|
|
+\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
|
|
|
|
+\[[ 0-9]+\] \.text +PROGBITS +0+20000 .*
|
|
|
|
+\[[ 0-9]+\] \.interp +.*
|
|
|
|
+\[[ 0-9]+\] \.hash +.*
|
|
|
|
+\[[ 0-9]+\] \.dynsym +.*
|
|
|
|
+\[[ 0-9]+\] \.dynstr +.*
|
|
|
|
+\[[ 0-9]+\] \.rel.dyn +.*
|
|
|
|
+\[[ 0-9]+\] \.tdata +PROGBITS +0*10031000 [0-9a-f]+ 000060 00 WAT +0 +0 4096
|
|
|
|
+\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000040 00 WAT +0 +0 +1
|
|
|
|
+\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10031060 .*
|
|
|
|
+\[[ 0-9]+\] \.got +PROGBITS +0*100310e0 .*
|
|
|
|
+\[[ 0-9]+\] \.got\.plt +PROGBITS +0*10031108 .*
|
|
|
|
+\[[ 0-9]+\] \.symtab +.*
|
|
|
|
+\[[ 0-9]+\] \.strtab +.*
|
2016-08-19 16:16:30 +08:00
|
|
|
+\[[ 0-9]+\] \.shstrtab +.*
|
Support i386 TLS code sequences without PLT
We can generate i386 TLS code sequences for general and local dynamic
models without PLT, which uses indirect call via GOT:
call *___tls_get_addr@GOT(%reg)
where EBX register isn't required as GOT base, instead of direct call:
call ___tls_get_addr[@PLT]
which requires EBX register as GOT base.
Since direct call is 4-byte long and indirect call, is 5-byte long, the
extra one byte must be handled properly.
For general dynamic model, 7-byte lea instruction before call instruction
is replaced by 6-byte one to make room for indirect call. For local
dynamic model, we simply use 5-byte indirect call.
TLS linker optimization is updated to recognize new instruction patterns.
For local dynamic model to local exec model transition, we generate
a 6-byte lea instruction as nop, instead of a 1-byte nop plus a 4-byte
lea instruction. Since linker may convert
call ___tls_get_addr[@PLT]
to
addr32 call ____tls_get_addr
when producing static executable, both patterns are recognized.
bfd/
* elf64-i386.c (elf_i386_link_hash_entry): Add tls_get_addr.
(elf_i386_link_hash_newfunc): Initialize tls_get_addr to 2.
(elf_i386_check_tls_transition): Check indirect call and direct
call with the addr32 prefix for general and local dynamic models.
Set the tls_get_addr feild.
(elf_i386_convert_load_reloc): Always use addr32 prefix for
indirect ___tls_get_addr call via GOT.
(elf_i386_relocate_section): Handle GD->LE, GD->IE and LD->LE
transitions with indirect call and direct call with the addr32
prefix.
ld/
* testsuite/ld-i386/i386.exp: Run libtlspic2.so, tlsbin2,
tlsgd3, tlsld2, tlsgd4, tlspie3a, tlspie3b and tlspie3c.
* testsuite/ld-i386/pass.out: New file.
* testsuite/ld-i386/tls-def1.c: Likewise.
* testsuite/ld-i386/tls-gd1.S: Likewise.
* testsuite/ld-i386/tls-ld1.S: Likewise.
* testsuite/ld-i386/tls-main1.c: Likewise.
* testsuite/ld-i386/tls.exp: Likewise.
* testsuite/ld-i386/tlsbin2-nacl.rd: Likewise.
* testsuite/ld-i386/tlsbin2.dd: Likewise.
* testsuite/ld-i386/tlsbin2.rd: Likewise.
* testsuite/ld-i386/tlsbin2.sd: Likewise.
* testsuite/ld-i386/tlsbin2.td: Likewise.
* testsuite/ld-i386/tlsbinpic2.s: Likewise.
* testsuite/ld-i386/tlsgd3.dd: Likewise.
* testsuite/ld-i386/tlsgd3.s: Likewise.
* testsuite/ld-i386/tlsgd4.d: Likewise.
* testsuite/ld-i386/tlsgd4.s: Likewise.
* testsuite/ld-i386/tlsld2.s: Likewise.
* testsuite/ld-i386/tlspic2-nacl.rd: Likewise.
* testsuite/ld-i386/tlspic2.dd: Likewise.
* testsuite/ld-i386/tlspic2.rd: Likewise.
* testsuite/ld-i386/tlspic2.sd: Likewise.
* testsuite/ld-i386/tlspic2.td: Likewise.
* testsuite/ld-i386/tlspic3.s: Likewise.
* testsuite/ld-i386/tlspie3.s: Likewise.
* testsuite/ld-i386/tlspie3a.d: Likewise.
* testsuite/ld-i386/tlspie3b.d: Likewise.
* testsuite/ld-i386/tlspie3c.d: Likewise.
2016-06-09 02:59:47 +08:00
|
|
|
Key to Flags:
|
|
|
|
#...
|
|
|
|
|
|
|
|
Elf file type is EXEC \(Executable file\)
|
|
|
|
Entry point 0x0*20188
|
|
|
|
There are [0-9]+ program headers, starting at offset [0-9]+
|
|
|
|
|
|
|
|
Program Headers:
|
|
|
|
+Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
|
|
|
|
+PHDR.*
|
|
|
|
+INTERP.*
|
|
|
|
.*Requesting program interpreter.*
|
|
|
|
+LOAD.*
|
|
|
|
+LOAD.*
|
|
|
|
+LOAD.*
|
|
|
|
+DYNAMIC.*
|
|
|
|
+TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
|
|
|
|
|
|
|
|
Section to Segment mapping:
|
|
|
|
+Segment Sections...
|
|
|
|
+00 +
|
|
|
|
+01 +.interp *
|
|
|
|
+02 +.text *
|
|
|
|
+03 +.interp .hash .dynsym .dynstr .rel.dyn *
|
|
|
|
+04 +.tdata .dynamic .got .got.plt *
|
|
|
|
+05 +.dynamic *
|
|
|
|
+06 +.tdata .tbss *
|
|
|
|
|
|
|
|
Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
|
|
|
|
Offset +Info +Type +Sym.Value +Sym. Name
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG3
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG5
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG7
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG2
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG4
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG4
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG6
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG1
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG8
|
|
|
|
[0-9a-f ]+R_386_GLOB_DAT +[0-9a-f]+ +___tls_get_addr
|
|
|
|
|
|
|
|
Symbol table '\.dynsym' contains [0-9]+ entries:
|
|
|
|
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
|
|
|
|
+[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
|
|
|
|
|
|
|
|
Symbol table '\.symtab' contains [0-9]+ entries:
|
|
|
|
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
|
|
|
|
+[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
|
|
|
|
.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic2.o
|
|
|
|
+[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +7 sl1
|
|
|
|
+[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +7 sl2
|
|
|
|
+[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +7 sl3
|
|
|
|
+[0-9]+: 0000002c +0 +TLS +LOCAL +DEFAULT +7 sl4
|
|
|
|
+[0-9]+: 00000030 +0 +TLS +LOCAL +DEFAULT +7 sl5
|
|
|
|
+[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +7 sl6
|
|
|
|
+[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +7 sl7
|
|
|
|
+[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +7 sl8
|
|
|
|
.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o
|
|
|
|
+[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +8 bl1
|
|
|
|
+[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +8 bl2
|
|
|
|
+[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +8 bl3
|
|
|
|
+[0-9]+: 0000008c +0 +TLS +LOCAL +DEFAULT +8 bl4
|
|
|
|
+[0-9]+: 00000090 +0 +TLS +LOCAL +DEFAULT +8 bl5
|
|
|
|
+[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +8 bl6
|
|
|
|
+[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +8 bl7
|
|
|
|
+[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +8 bl8
|
|
|
|
.* FILE +LOCAL +DEFAULT +ABS
|
|
|
|
+[0-9]+: 0*10031060 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
|
|
|
|
+[0-9]+: 0000001c +0 +TLS +GLOBAL +DEFAULT +7 sg8
|
|
|
|
+[0-9]+: 0000007c +0 +TLS +GLOBAL +DEFAULT +8 bg8
|
|
|
|
+[0-9]+: 00000074 +0 +TLS +GLOBAL +DEFAULT +8 bg6
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
|
|
|
|
+[0-9]+: 00000068 +0 +TLS +GLOBAL +DEFAULT +8 bg3
|
|
|
|
+[0-9]+: 00000008 +0 +TLS +GLOBAL +DEFAULT +7 sg3
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
|
|
|
|
+[0-9]+: 00000048 +0 +TLS +GLOBAL +HIDDEN +7 sh3
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
|
|
|
|
+[0-9]+: 0000000c +0 +TLS +GLOBAL +DEFAULT +7 sg4
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
|
|
|
|
+[0-9]+: 00000010 +0 +TLS +GLOBAL +DEFAULT +7 sg5
|
|
|
|
+[0-9]+: 00000070 +0 +TLS +GLOBAL +DEFAULT +8 bg5
|
|
|
|
+[0-9]+: 00000058 +0 +TLS +GLOBAL +HIDDEN +7 sh7
|
|
|
|
+[0-9]+: 0000005c +0 +TLS +GLOBAL +HIDDEN +7 sh8
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
|
|
|
|
+[0-9]+: 0+20188 +0 +FUNC +GLOBAL +DEFAULT +1 _start
|
|
|
|
+[0-9]+: 0000004c +0 +TLS +GLOBAL +HIDDEN +7 sh4
|
|
|
|
+[0-9]+: 00000078 +0 +TLS +GLOBAL +DEFAULT +8 bg7
|
|
|
|
+[0-9]+: 00000050 +0 +TLS +GLOBAL +HIDDEN +7 sh5
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
|
|
|
|
+[0-9]+: 0+20000 +0 +FUNC +GLOBAL +DEFAULT +1 fn2
|
|
|
|
+[0-9]+: 00000004 +0 +TLS +GLOBAL +DEFAULT +7 sg2
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
|
|
|
|
+[0-9]+: 00000040 +0 +TLS +GLOBAL +HIDDEN +7 sh1
|
|
|
|
+[0-9]+: 00000014 +0 +TLS +GLOBAL +DEFAULT +7 sg6
|
|
|
|
+[0-9]+: 00000018 +0 +TLS +GLOBAL +DEFAULT +7 sg7
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _end
|
|
|
|
+[0-9]+: 00000044 +0 +TLS +GLOBAL +HIDDEN +7 sh2
|
|
|
|
+[0-9]+: 00000054 +0 +TLS +GLOBAL +HIDDEN +7 sh6
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
|
|
|
|
+[0-9]+: 00000064 +0 +TLS +GLOBAL +DEFAULT +8 bg2
|
|
|
|
+[0-9]+: 00000060 +0 +TLS +GLOBAL +DEFAULT +8 bg1
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
|
|
|
|
+[0-9]+: 0000006c +0 +TLS +GLOBAL +DEFAULT +8 bg4
|