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.
71 lines
2.6 KiB
Makefile
71 lines
2.6 KiB
Makefile
#source: tlstoc.s
|
|
#as: -a64
|
|
#ld: tmpdir/libtlslib.so
|
|
#objdump: -dr
|
|
#target: powerpc64*-*-*
|
|
|
|
.*
|
|
|
|
Disassembly of section \.text:
|
|
|
|
.* <.*plt_call\.__tls_get_addr(|_opt)>:
|
|
.* (e9 63 00 00|00 00 63 e9) ld r11,0\(r3\)
|
|
.* (e9 83 00 08|08 00 83 e9) ld r12,8\(r3\)
|
|
.* (7c 60 1b 78|78 1b 60 7c) mr r0,r3
|
|
.* (2c 2b 00 00|00 00 2b 2c) cmpdi r11,0
|
|
.* (7c 6c 6a 14|14 6a 6c 7c) add r3,r12,r13
|
|
.* (4d 82 00 20|20 00 82 4d) beqlr *
|
|
.* (7c 03 03 78|78 03 03 7c) mr r3,r0
|
|
.* (7d 68 02 a6|a6 02 68 7d) mflr r11
|
|
.* (f9 61 00 20|20 00 61 f9) std r11,32\(r1\)
|
|
.* (f8 41 00 28|28 00 41 f8) std r2,40\(r1\)
|
|
.* (e9 82 80 70|70 80 82 e9) ld r12,-32656\(r2\)
|
|
.* (7d 89 03 a6|a6 03 89 7d) mtctr r12
|
|
.* (e8 42 80 78|78 80 42 e8) ld r2,-32648\(r2\)
|
|
.* (4e 80 04 21|21 04 80 4e) bctrl
|
|
.* (e8 41 00 28|28 00 41 e8) ld r2,40\(r1\)
|
|
.* (e9 61 00 20|20 00 61 e9) ld r11,32\(r1\)
|
|
.* (7d 68 03 a6|a6 03 68 7d) mtlr r11
|
|
.* (4e 80 00 20|20 00 80 4e) blr
|
|
|
|
.* <\._start>:
|
|
.* (38 62 80 08|08 80 62 38) addi r3,r2,-32760
|
|
.* (4b ff ff b5|b5 ff ff 4b) bl .*
|
|
.* (60 00 00 00|00 00 00 60) nop
|
|
.* (38 62 80 18|18 80 62 38) addi r3,r2,-32744
|
|
.* (4b ff ff a9|a9 ff ff 4b) bl .*
|
|
.* (60 00 00 00|00 00 00 60) nop
|
|
.* (60 00 00 00|00 00 00 60) nop
|
|
.* (38 6d 90 38|38 90 6d 38) addi r3,r13,-28616
|
|
.* (60 00 00 00|00 00 00 60) nop
|
|
.* (60 00 00 00|00 00 00 60) nop
|
|
.* (38 6d 10 00|00 10 6d 38) addi r3,r13,4096
|
|
.* (60 00 00 00|00 00 00 60) nop
|
|
.* (39 23 80 40|40 80 23 39) addi r9,r3,-32704
|
|
.* (3d 23 00 00|00 00 23 3d) addis r9,r3,0
|
|
.* (81 49 80 48|48 80 49 81) lwz r10,-32696\(r9\)
|
|
.* (e9 22 80 48|48 80 22 e9) ld r9,-32696\(r2\)
|
|
.* (7d 49 18 2a|2a 18 49 7d) ldx r10,r9,r3
|
|
.* (60 00 00 00|00 00 00 60) nop
|
|
.* (a1 4d 90 58|58 90 4d a1) lhz r10,-28584\(r13\)
|
|
.* (89 4d 90 60|60 90 4d 89) lbz r10,-28576\(r13\)
|
|
.* (60 00 00 00|00 00 00 60) nop
|
|
.* (99 4d 90 68|68 90 4d 99) stb r10,-28568\(r13\)
|
|
.* (00 00 00 00|68 02 01 00) .*
|
|
.* (00 01 02 68|00 00 00 00) .*
|
|
.* <__glink_PLTresolve>:
|
|
.* (7d 88 02 a6|a6 02 88 7d) mflr r12
|
|
.* (42 9f 00 05|05 00 9f 42) bcl 20,4\*cr7\+so,.*
|
|
.* (7d 68 02 a6|a6 02 68 7d) mflr r11
|
|
.* (e8 4b ff f0|f0 ff 4b e8) ld r2,-16\(r11\)
|
|
.* (7d 88 03 a6|a6 03 88 7d) mtlr r12
|
|
.* (7d 62 5a 14|14 5a 62 7d) add r11,r2,r11
|
|
.* (e9 8b 00 00|00 00 8b e9) ld r12,0\(r11\)
|
|
.* (e8 4b 00 08|08 00 4b e8) ld r2,8\(r11\)
|
|
.* (7d 89 03 a6|a6 03 89 7d) mtctr r12
|
|
.* (e9 6b 00 10|10 00 6b e9) ld r11,16\(r11\)
|
|
.* (4e 80 04 20|20 04 80 4e) bctr
|
|
.* <__tls_get_addr_opt@plt>:
|
|
.* (38 00 00 00|00 00 00 38) li r0,0
|
|
.* (4b ff ff d0|d0 ff ff 4b) b .*
|