From e7d1c40ce59ff355d2a51ff64a657c772eabbbfe Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 17 Feb 2014 17:08:00 +1030 Subject: Consolidate ppc64 ld/bfd communication Moves assorted variables used to communicate between ld and bfd into a struct, hooks it into the bfd link_hash_table early, and removes all other places where such variables were passed piecemeal. bfd/ * elf64-ppc.h (struct ppc64_elf_params): Define. (ppc64_elf_init_stub_bfd, ppc64_elf_edit_opd, ppc64_elf_tls_setup, ppc64_elf_setup_section_lists, ppc64_elf_size_stubs, ppc64_elf_build_stubs): Update prototype. * elf64-ppp.c (struct ppc_link_hash_table): Add params, delete other fields now in params. Adjust code throughout file. (ppc64_elf_init_stub_bfd): Delete "abfd" parameter, add "params". Save params pointer in htab. (ppc64_elf_edit_opd, ppc64_elf_tls_setup, ppc64_elf_setup_section_lists, ppc64_elf_size_stubs, ppc64_elf_build_stubs): Remove parameters now in "params". ld/ * emultemps/ppc64elf.em (params): New static struct replacing various other static vars. Adjust code throughout file. --- bfd/elf64-ppc.h | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) (limited to 'bfd/elf64-ppc.h') diff --git a/bfd/elf64-ppc.h b/bfd/elf64-ppc.h index 06c655f..3a2299a 100644 --- a/bfd/elf64-ppc.h +++ b/bfd/elf64-ppc.h @@ -19,12 +19,50 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +/* Used to pass info between ld and bfd. */ +struct ppc64_elf_params +{ + /* Linker stub bfd. */ + bfd *stub_bfd; + + /* Linker call-backs. */ + asection * (*add_stub_section) (const char *, asection *); + void (*layout_sections_again) (void); + + /* Maximum size of a group of input sections that can be handled by + one stub section. A value of +/-1 indicates the bfd back-end + should use a suitable default size. */ + bfd_signed_vma group_size; + + /* Whether to use a special call stub for __tls_get_addr. */ + int no_tls_get_addr_opt; + + /* Whether to allow multiple toc sections. */ + int no_multi_toc; + + /* Set if PLT call stubs should load r11. */ + int plt_static_chain; + + /* Set if PLT call stubs need to be thread safe on power7+. */ + int plt_thread_safe; + + /* Set if individual PLT call stubs should be aligned. */ + int plt_stub_align; + + /* Whether to canonicalize .opd so that there are no overlapping + .opd entries. */ + int non_overlapping_opd; + + /* Whether to emit symbols for stubs. */ + int emit_stub_syms; +}; + bfd_boolean ppc64_elf_init_stub_bfd - (bfd *, struct bfd_link_info *); + (struct bfd_link_info *, struct ppc64_elf_params *); bfd_boolean ppc64_elf_edit_opd - (struct bfd_link_info *, bfd_boolean); + (struct bfd_link_info *); asection *ppc64_elf_tls_setup - (struct bfd_link_info *, int, int *); + (struct bfd_link_info *); bfd_boolean ppc64_elf_tls_optimize (struct bfd_link_info *); bfd_boolean ppc64_elf_edit_toc @@ -32,10 +70,9 @@ bfd_boolean ppc64_elf_edit_toc bfd_boolean ppc64_elf_has_small_toc_reloc (asection *); bfd_vma ppc64_elf_set_toc - (struct bfd_link_info *, bfd *); +(struct bfd_link_info *, bfd *); int ppc64_elf_setup_section_lists - (struct bfd_link_info *, asection *(*) (const char *, asection *), - void (*) (void)); + (struct bfd_link_info *); void ppc64_elf_start_multitoc_partition (struct bfd_link_info *); bfd_boolean ppc64_elf_next_toc_section @@ -49,8 +86,8 @@ bfd_boolean ppc64_elf_check_init_fini bfd_boolean ppc64_elf_next_input_section (struct bfd_link_info *, asection *); bfd_boolean ppc64_elf_size_stubs -(struct bfd_link_info *, bfd_signed_vma, bfd_boolean, int, int); +(struct bfd_link_info *); bfd_boolean ppc64_elf_build_stubs - (bfd_boolean, struct bfd_link_info *, char **); + (struct bfd_link_info *, char **); void ppc64_elf_restore_symbols (struct bfd_link_info *info); -- cgit v1.1