From d2a300cfe348688766fc425056c10512691bae65 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 19 Jun 2003 13:50:35 +0000 Subject: [PATCH] * elf64-ppc.c (ppc64_elf_reloc_type_lookup): Tidy prototype. (ppc64_elf_info_to_howto): Likewise. (ppc64_elf_build_stubs): Add "stats" param, and print statistics. * elf64-ppc.h (ppc64_elf_build_stubs): Adjust prototype. --- bfd/ChangeLog | 7 +++++++ bfd/elf64-ppc.c | 31 +++++++++++++++++++++++++++---- bfd/elf64-ppc.h | 2 +- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5304adbe68..28284ecd2d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2003-06-19 Alan Modra + + * elf64-ppc.c (ppc64_elf_reloc_type_lookup): Tidy prototype. + (ppc64_elf_info_to_howto): Likewise. + (ppc64_elf_build_stubs): Add "stats" param, and print statistics. + * elf64-ppc.h (ppc64_elf_build_stubs): Adjust prototype. + 2003-06-19 Alan Modra * elf64-sparc.c (sparc64_elf_relocate_section): Ignore R_SPARC_DISP32 diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 8ffae99bdf..6414d13952 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -33,9 +33,9 @@ static void ppc_howto_init PARAMS ((void)); static reloc_howto_type *ppc64_elf_reloc_type_lookup - PARAMS ((bfd *abfd, bfd_reloc_code_real_type code)); + PARAMS ((bfd *, bfd_reloc_code_real_type)); static void ppc64_elf_info_to_howto - PARAMS ((bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)); + PARAMS ((bfd *, arelent *, Elf_Internal_Rela *)); static bfd_reloc_status_type ppc64_elf_ha_reloc PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); static bfd_reloc_status_type ppc64_elf_brtaken_reloc @@ -7114,9 +7114,10 @@ ppc64_elf_toc (obfd) hash table. This function is called via gldelf64ppc_finish. */ bfd_boolean -ppc64_elf_build_stubs (emit_stub_syms, info) +ppc64_elf_build_stubs (emit_stub_syms, info, stats) bfd_boolean emit_stub_syms; struct bfd_link_info *info; + char **stats; { struct ppc_link_hash_table *htab = ppc_hash_table (info); asection *stub_sec; @@ -7242,7 +7243,29 @@ ppc64_elf_build_stubs (emit_stub_syms, info) (*_bfd_error_handler) (_("stubs don't match calculated size")); } - return !htab->stub_error; + if (htab->stub_error) + return FALSE; + + if (stats != NULL) + { + *stats = bfd_malloc (500); + if (*stats == NULL) + return FALSE; + + sprintf (*stats, _("linker stubs in %u groups\n" + " branch %lu\n" + " toc adjust %lu\n" + " long branch %lu\n" + " long toc adj %lu\n" + " plt call %lu"), + htab->stub_bfd->section_count, + htab->stub_count[(int) ppc_stub_long_branch - 1], + htab->stub_count[(int) ppc_stub_long_branch_r2off - 1], + htab->stub_count[(int) ppc_stub_plt_branch - 1], + htab->stub_count[(int) ppc_stub_plt_branch_r2off - 1], + htab->stub_count[(int) ppc_stub_plt_call - 1]); + } + return TRUE; } /* The RELOCATE_SECTION function is called by the ELF backend linker diff --git a/bfd/elf64-ppc.h b/bfd/elf64-ppc.h index cf720b4798..10f7da6594 100644 --- a/bfd/elf64-ppc.h +++ b/bfd/elf64-ppc.h @@ -39,4 +39,4 @@ bfd_boolean ppc64_elf_size_stubs PARAMS ((bfd *, bfd *, struct bfd_link_info *, bfd_signed_vma, asection *(*) (const char *, asection *), void (*) (void))); bfd_boolean ppc64_elf_build_stubs - PARAMS ((bfd_boolean, struct bfd_link_info *)); + PARAMS ((bfd_boolean, struct bfd_link_info *, char **)); -- 2.34.1