mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
9e390558ce
This is in preparation for the next patch adding Spectre variant 2 mitigation for PowerPC and PowerPC64. Besides tidying code involved in stub output (to reduce the number of places where bctr is output), the patch adds some user visible features: 1) PowerPC64 ELFv2 global entry stubs now are aligned under the control of --plt-align, with a default alignment of 32 bytes. 2) PowerPC64 __glink_PLTresolve is no longer padded out with nops. 3) PowerPC32 PLT stubs are aligned under the control of --plt-align, with the default alignment being 16 bytes as before. 4) The PowerPC32 branch/nop table emitted before __glink_PLTresolve is now smaller in many cases. It was sized incorrectly when the __tls_get_addr_opt stub was used, and unnecessarily included space for local ifuncs. bfd/ * elf32-ppc.c (GLINK_ENTRY_SIZE): Add parameters, handle __tls_get_addr_opt, and alignment sizing. (TLS_GET_ADDR_GLINK_SIZE): Delete. (is_nonpic_glink_stub): Don't use GLINK_ENTRY_SIZE. (ppc_elf_get_synthetic_symtab): Recognize stubs spaced at 4, 6, or 8 insns. (ppc_elf_link_hash_table_create): Init new ppc_elf_params field. (allocate_dynrelocs): Use new GLINK_ENTRY_SIZE. (ppc_elf_size_dynamic_sections): Likewise. Size branch table by PLT reloc count. (write_glink_stub): Handle __tls_get_addr_opt stub. Pad out to size given by GLINK_ENTRY_SIZE. (ppc_elf_relocate_section): Adjust write_glink_stub call. (ppc_elf_finish_dynamic_symbol): Likewise. (ppc_elf_finish_dynamic_sections): Write PLTresolve without using insn array since so many need rewriting. * elf32-ppc.h (struct ppc_elf_params): Add plt_stub_align. * elf64-ppc.c (GLINK_PLTRESOLVE_SIZE): Rename from GLINK_CALL_STUB_SIZE. Add htab param and evaluate to size without nops. Adjust all uses. (ppc64_elf_get_synthetic_symtab): Don't use GLINK_CALL_STUB_SIZE in glink_vma calculation. (struct ppc_link_hash_table): Add global_entry section pointer. (create_linkage_sections): Create separate section for global entry stubs. (PPC_LO, PPC_HI, PPC_HA): Move earlier. (size_global_entry_stubs): Handle sizing for aligned stubs. (ppc64_elf_size_dynamic_sections): Handle global_entry alloc, and don't stash end of glink branch table in rawsize. (ppc_build_one_stub): Rewrite stub size calculations. (build_global_entry_stubs): Use new section. (ppc64_elf_build_stubs): Don't pad __glink_PLTresolve with nops. Build lazy link stubs out to end of section. Build global entry stubs in new section. gold/ * options.h (plt_align): Support for PowerPC32 too. * powerpc.cc (Stub_table::stub_align): Heed --plt-align for 32-bit. (Stub_table::plt_call_size, branch_stub_size): Tidy. (Stub_table::plt_call_align): Implement using stub_align. (Output_data_glink::global_entry_align): New function. (Output_data_glink::global_entry_off): New function. (Output_data_glink::global_entry_address): Use global_entry_off. (Output_data_glink::pltresolve_size): New function, replacing pltresolve_size_ constant. Update all uses. (Output_data_glink::add_global_entry): Align offset. (Output_data_glink::set_final_data_size): Use global_entry_align. (Stub_table::do_write): Don't pad __glink_PLTrelsolve with nops. Tidy stub output. Use global_entry_off. ld/ * emultempl/ppc32elf.em (params): Init new field. (enum ppc32_opt): New enum to define OPTION_* values. Add OPTION_PLT_ALIGN and OPTION_NO_PLT_ALIGN. (PARSE_AND_LIST_LONGOPTS): Handle new options. (PARSE_AND_LIST_ARGS_CASES): Likewise. (PARSE_AND_LIST_OPTIONS): Likewise. Break up help output. * emultempl/ppc64elf.em (ppc_add_stub_section): Init alignment correctly for negative --plt-stub-align. * testsuite/ld-powerpc/elfv2exe.d, * testsuite/ld-powerpc/elfv2so.d, * testsuite/ld-powerpc/relbrlt.d, * testsuite/ld-powerpc/relbrlt.s, * testsuite/ld-powerpc/tlsexe.d, * testsuite/ld-powerpc/tlsexe.r, * testsuite/ld-powerpc/tlsexe32.d, * testsuite/ld-powerpc/tlsexe32.g, * testsuite/ld-powerpc/tlsexe32.r, * testsuite/ld-powerpc/tlsexetoc.d, * testsuite/ld-powerpc/tlsexetoc.r, * testsuite/ld-powerpc/tlsopt5_32.d, * testsuite/ld-powerpc/tlsso.d, * testsuite/ld-powerpc/tlstocso.d: Update for changed stub order.
115 lines
3.7 KiB
R
115 lines
3.7 KiB
R
#source: tls.s
|
|
#source: tlslib.s
|
|
#as: -a64
|
|
#ld:
|
|
#readelf: -WSsrl
|
|
#target: powerpc64*-*-*
|
|
|
|
There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
|
|
|
|
Section Headers:
|
|
+\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
|
|
+\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
|
|
+\[[ 0-9]+\] \.interp +.*
|
|
+\[[ 0-9]+\] \.hash +.*
|
|
+\[[ 0-9]+\] \.dynsym +.*
|
|
+\[[ 0-9]+\] \.dynstr +.*
|
|
+\[[ 0-9]+\] \.rela\.dyn +.*
|
|
+\[[ 0-9]+\] \.rela\.plt +.*
|
|
+\[[ 0-9]+\] \.text +PROGBITS .* 0+11c 0+ +AX +0 +0 +32
|
|
+\[[ 0-9]+\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
|
|
+\[[ 0-9]+\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
|
|
+\[[ 0-9]+\] \.dynamic +DYNAMIC .* 0+160 10 +WA +4 +0 +8
|
|
+\[[ 0-9]+\] \.opd .*
|
|
+\[[ 0-9]+\] \.got +PROGBITS .* 0+30 08 +WA +0 +0 +256
|
|
+\[[ 0-9]+\] \.plt +.*
|
|
+\[[ 0-9]+\] \.symtab +.*
|
|
+\[[ 0-9]+\] \.strtab +.*
|
|
+\[[ 0-9]+\] \.shstrtab +.*
|
|
#...
|
|
|
|
Elf file type is EXEC \(Executable file\)
|
|
Entry point .*
|
|
There are [0-9]+ program headers, starting at offset [0-9]+
|
|
|
|
Program Headers:
|
|
+Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
|
|
+PHDR +0x0+40 0x0+10000040 0x0+10000040 0x0+150 0x0+150 R +0x8
|
|
+INTERP +0x0+190 0x0+10000190 0x0+10000190 0x0+11 0x0+11 R +0x1
|
|
+\[Requesting program interpreter: .*\]
|
|
+LOAD .* R E 0x10000
|
|
+LOAD .* RW +0x10000
|
|
+DYNAMIC .* RW +0x8
|
|
+TLS .* 0x0+38 0x0+70 R +0x8
|
|
|
|
Section to Segment mapping:
|
|
+Segment Sections\.\.\.
|
|
+0+ +
|
|
+01 +\.interp *
|
|
+02 +\.interp \.hash \.dynsym \.dynstr \.rela\.dyn \.rela\.plt \.text *
|
|
+03 +\.tdata \.dynamic \.opd \.got \.plt *
|
|
+04 +\.dynamic *
|
|
+05 +\.tdata \.tbss *
|
|
|
|
Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
|
|
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
|
|
[0-9a-f ]+R_PPC64_TPREL64 +0+ gd \+ 0
|
|
[0-9a-f ]+R_PPC64_DTPMOD64 +0+ ld \+ 0
|
|
|
|
Relocation section '\.rela\.plt' at offset .* contains 1 entry:
|
|
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
|
|
[0-9a-f ]+R_PPC64_JMP_SLOT +0+ __tls_get_addr_opt \+ 0
|
|
|
|
Symbol table '\.dynsym' contains [0-9]+ entries:
|
|
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
|
|
.* NOTYPE +LOCAL +DEFAULT +UND *
|
|
.* TLS +GLOBAL +DEFAULT +UND gd
|
|
.* TLS +GLOBAL +DEFAULT +UND ld
|
|
.* NOTYPE +GLOBAL +DEFAULT +13 __bss_start
|
|
.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr_opt
|
|
.* NOTYPE +GLOBAL +DEFAULT +13 _edata
|
|
.* NOTYPE +GLOBAL +DEFAULT +13 _end
|
|
|
|
Symbol table '\.symtab' contains [0-9]+ entries:
|
|
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
|
|
.* 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
|
|
.* SECTION +LOCAL +DEFAULT +1 *
|
|
.* SECTION +LOCAL +DEFAULT +2 *
|
|
.* SECTION +LOCAL +DEFAULT +3 *
|
|
.* SECTION +LOCAL +DEFAULT +4 *
|
|
.* SECTION +LOCAL +DEFAULT +5 *
|
|
.* SECTION +LOCAL +DEFAULT +6 *
|
|
.* SECTION +LOCAL +DEFAULT +7 *
|
|
.* SECTION +LOCAL +DEFAULT +8 *
|
|
.* SECTION +LOCAL +DEFAULT +9 *
|
|
.* SECTION +LOCAL +DEFAULT +10 *
|
|
.* SECTION +LOCAL +DEFAULT +11 *
|
|
.* SECTION +LOCAL +DEFAULT +12 *
|
|
.* SECTION +LOCAL +DEFAULT +13 *
|
|
.* FILE +LOCAL +DEFAULT +ABS .*
|
|
.* TLS +LOCAL +DEFAULT +8 gd4
|
|
.* TLS +LOCAL +DEFAULT +8 ld4
|
|
.* TLS +LOCAL +DEFAULT +8 ld5
|
|
.* TLS +LOCAL +DEFAULT +8 ld6
|
|
.* TLS +LOCAL +DEFAULT +8 ie4
|
|
.* TLS +LOCAL +DEFAULT +8 le4
|
|
.* TLS +LOCAL +DEFAULT +8 le5
|
|
.* FILE +LOCAL +DEFAULT +ABS
|
|
.* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
|
|
.* NOTYPE +LOCAL +DEFAULT +7 __glink_PLTresolve
|
|
.* NOTYPE +LOCAL +DEFAULT +7 .*\.plt_call\.__tls_get_addr(|_opt)
|
|
.* GLOBAL +DEFAULT +UND gd
|
|
.* GLOBAL +DEFAULT +9 le0
|
|
.* GLOBAL +DEFAULT +9 ld0
|
|
.* GLOBAL +DEFAULT +9 le1
|
|
.* GLOBAL +DEFAULT +UND ld
|
|
.* FUNC +GLOBAL +DEFAULT +11 _start
|
|
.* TLS +GLOBAL +DEFAULT +9 ld2
|
|
.* TLS +GLOBAL +DEFAULT +9 ld1
|
|
.* NOTYPE +GLOBAL +DEFAULT +13 __bss_start
|
|
.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr_opt
|
|
.* NOTYPE +GLOBAL +DEFAULT +13 _edata
|
|
.* NOTYPE +GLOBAL +DEFAULT +13 _end
|
|
.* TLS +GLOBAL +DEFAULT +9 gd0
|
|
.* TLS +GLOBAL +DEFAULT +9 ie0
|