From 61643fbadb17932965e5c02db75ec3f8e211d7b1 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Mon, 19 Oct 2015 13:08:27 +0200 Subject: [PATCH] S/390: Get rid of superfluous parameter to s390_elf_allocate_ifunc_dyn_relocs. bfd/ChangeLog: * elf-s390-common.c (s390_elf_allocate_ifunc_dyn_relocs): Remove `head' parameter. * elf32-s390.c (allocate_dynrelocs): Don't use last parameter. * elf64-s390.c (allocate_dynrelocs): Don't use last parameter. --- bfd/ChangeLog | 7 +++++++ bfd/elf-s390-common.c | 4 ++-- bfd/elf32-s390.c | 3 +-- bfd/elf64-s390.c | 3 +-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 862664a44df..6eec6650a1b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2015-10-22 Andreas Krebbel + + * elf-s390-common.c (s390_elf_allocate_ifunc_dyn_relocs): Remove + `head' parameter. + * elf32-s390.c (allocate_dynrelocs): Don't use last parameter. + * elf64-s390.c (allocate_dynrelocs): Don't use last parameter. + 2015-10-20 Hans-Peter Nilsson * mmo.c (mmo_write_symbols_and_terminator): Correct printed value diff --git a/bfd/elf-s390-common.c b/bfd/elf-s390-common.c index 6b5b17b1846..2daeef6fbb9 100644 --- a/bfd/elf-s390-common.c +++ b/bfd/elf-s390-common.c @@ -87,12 +87,12 @@ s390_elf_create_ifunc_sections (bfd *abfd, struct bfd_link_info *info) static bfd_boolean s390_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info, - struct elf_link_hash_entry *h, - struct elf_dyn_relocs **head) + struct elf_link_hash_entry *h) { struct elf_dyn_relocs *p; struct elf_link_hash_table *htab; struct elf_s390_link_hash_entry *eh = (struct elf_s390_link_hash_entry*)h; + struct elf_dyn_relocs **head = &eh->dyn_relocs; htab = elf_hash_table (info); eh->ifunc_resolver_address = h->root.u.def.value; diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index dc2d80ff2e3..509d8f9d198 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -1787,8 +1787,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it here if it is defined and referenced in a non-shared object. */ if (s390_is_ifunc_symbol_p (h) && h->def_regular) - return s390_elf_allocate_ifunc_dyn_relocs (info, h, - &eh->dyn_relocs); + return s390_elf_allocate_ifunc_dyn_relocs (info, h); else if (htab->elf.dynamic_sections_created && h->plt.refcount > 0) { diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index 7cc0489d84d..d988b121c31 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -1734,8 +1734,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it here if it is defined and referenced in a non-shared object. */ if (s390_is_ifunc_symbol_p (h) && h->def_regular) - return s390_elf_allocate_ifunc_dyn_relocs (info, h, - &eh->dyn_relocs); + return s390_elf_allocate_ifunc_dyn_relocs (info, h); else if (htab->elf.dynamic_sections_created && h->plt.refcount > 0) { -- 2.30.2