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: tlspic3.s
|
|
|
|
#source: tlspic2.s
|
|
|
|
#as: --32
|
|
|
|
#ld: -shared -melf_i386 --no-ld-generated-unwind-info
|
|
|
|
#readelf: -Ssrl
|
|
|
|
#target: i?86-*-*
|
|
|
|
|
|
|
|
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]+\] \.hash +.*
|
|
|
|
+\[[ 0-9]+\] \.dynsym +.*
|
|
|
|
+\[[ 0-9]+\] \.dynstr +.*
|
|
|
|
+\[[ 0-9]+\] \.rel.dyn +.*
|
|
|
|
+\[[ 0-9]+\] \.text +.*
|
|
|
|
+\[[ 0-9]+\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000060 00 WAT +0 +0 +1
|
|
|
|
+\[[ 0-9]+\] \.tbss +NOBITS +[0-9aa-f]+ [0-9a-f]+ 000020 00 WAT +0 +0 +1
|
|
|
|
+\[[ 0-9]+\] \.dynamic +.*
|
|
|
|
+\[[ 0-9]+\] \.got +.*
|
|
|
|
+\[[ 0-9]+\] \.got.plt +.*
|
|
|
|
+\[[ 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 DYN \(Shared object file\)
|
|
|
|
Entry point 0x[0-9a-f]+
|
|
|
|
There are [0-9]+ program headers, starting at offset [0-9]+
|
|
|
|
|
|
|
|
Program Headers:
|
|
|
|
+Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
|
|
|
|
+LOAD.*
|
|
|
|
+LOAD.*
|
|
|
|
+DYNAMIC.*
|
|
|
|
+TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
|
|
|
|
|
|
|
|
Section to Segment mapping:
|
|
|
|
+Segment Sections...
|
|
|
|
+00 +.hash .dynsym .dynstr .rel.dyn .text *
|
|
|
|
+01 +.tdata .dynamic .got .got.plt *
|
|
|
|
+02 +.dynamic *
|
|
|
|
+03 +.tdata .tbss *
|
|
|
|
|
|
|
|
Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 27 entries:
|
|
|
|
Offset +Info +Type +Sym.Value +Sym. Name
|
|
|
|
[0-9a-f ]+R_386_TLS_DTPMOD3
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF *
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF *
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF *
|
|
|
|
[0-9a-f ]+R_386_TLS_DTPMOD3
|
|
|
|
[0-9a-f ]+R_386_TLS_DTPMOD3
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF *
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF *
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF *
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF *
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF *
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF *
|
|
|
|
[0-9a-f ]+R_386_TLS_DTPMOD3
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF +0+8 +sg3
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32 0+c +sg4
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF +0+c +sg4
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF +0+10 +sg5
|
|
|
|
[0-9a-f ]+R_386_TLS_DTPMOD3 0+ +sg1
|
|
|
|
[0-9a-f ]+R_386_TLS_DTPOFF3 0+ +sg1
|
|
|
|
[0-9a-f ]+R_386_TLS_TPOFF32 0+4 +sg2
|
|
|
|
[0-9a-f ]+R_386_GLOB_DAT +0+ +___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+1c +0 +TLS +GLOBAL +DEFAULT +6 sg8
|
|
|
|
+[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +6 sg3
|
|
|
|
+[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +6 sg4
|
|
|
|
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +6 sg5
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +6 sg1
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +5 fn1
|
|
|
|
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +6 sg2
|
|
|
|
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +6 sg6
|
|
|
|
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +6 sg7
|
|
|
|
+[0-9]+: 0+ +0 +NOTYPE +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 *
|
2021-01-04 14:43:51 +08:00
|
|
|
.* FILE +LOCAL +DEFAULT +ABS .*tlspic3.o
|
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
|
|
|
+[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +6 sl1
|
|
|
|
+[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +6 sl2
|
|
|
|
+[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +6 sl3
|
|
|
|
+[0-9]+: 0+2c +0 +TLS +LOCAL +DEFAULT +6 sl4
|
|
|
|
+[0-9]+: 0+30 +0 +TLS +LOCAL +DEFAULT +6 sl5
|
|
|
|
+[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +6 sl6
|
|
|
|
+[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +6 sl7
|
|
|
|
+[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +6 sl8
|
|
|
|
.* FILE +LOCAL +DEFAULT +ABS
|
|
|
|
+[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +7 sH1
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +8 _DYNAMIC
|
|
|
|
+[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +6 sh3
|
|
|
|
+[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +7 sH2
|
|
|
|
+[0-9]+: 0+78 +0 +TLS +LOCAL +DEFAULT +7 sH7
|
|
|
|
+[0-9]+: 0+58 +0 +TLS +LOCAL +DEFAULT +6 sh7
|
|
|
|
+[0-9]+: 0+5c +0 +TLS +LOCAL +DEFAULT +6 sh8
|
|
|
|
+[0-9]+: 0+6c +0 +TLS +LOCAL +DEFAULT +7 sH4
|
|
|
|
+[0-9]+: 0+4c +0 +TLS +LOCAL +DEFAULT +6 sh4
|
|
|
|
+[0-9]+: 0+68 +0 +TLS +LOCAL +DEFAULT +7 sH3
|
|
|
|
+[0-9]+: 0+50 +0 +TLS +LOCAL +DEFAULT +6 sh5
|
|
|
|
+[0-9]+: 0+70 +0 +TLS +LOCAL +DEFAULT +7 sH5
|
|
|
|
+[0-9]+: 0+74 +0 +TLS +LOCAL +DEFAULT +7 sH6
|
|
|
|
+[0-9]+: 0+7c +0 +TLS +LOCAL +DEFAULT +7 sH8
|
|
|
|
+[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +6 sh1
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _GLOBAL_OFFSET_TABLE_
|
|
|
|
+[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +6 sh2
|
|
|
|
+[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +6 sh6
|
|
|
|
+[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +6 sg8
|
|
|
|
+[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +6 sg3
|
|
|
|
+[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +6 sg4
|
|
|
|
+[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +6 sg5
|
|
|
|
+[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +6 sg1
|
|
|
|
+[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +5 fn1
|
|
|
|
+[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +6 sg2
|
|
|
|
+[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +6 sg6
|
|
|
|
+[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +6 sg7
|
|
|
|
+[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
|