diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2013-03-25 06:00:06 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2013-03-25 06:00:06 +0000 |
| commit | 553bc81c7076a9bffec379cbf5b0005393545dd9 (patch) | |
| tree | 1590f0d6574d8676d2346664fbb3c9a7819b2a6e /bfd/elf-bfd.h | |
| parent | 6862ad00f0ab832cf606f201bdae9ac1bc8173a5 (diff) | |
| download | binutils-redhat-553bc81c7076a9bffec379cbf5b0005393545dd9.tar.gz | |
* elf-bfd.h (struct elf_backend_data <merge_symbol>): Update proto.
(_bfd_elf_init_reloc_shdr): Delete.
* elf.c (_bfd_elf_init_reloc_shdr): Make static.
* elf64-x86-64.c (elf_x86_64_merge_symbol): Trim parameters to
just what is needed.
* elflink.c (_bfd_elf_merge_symbol): Update bed->merge_symbol call.
Diffstat (limited to 'bfd/elf-bfd.h')
| -rw-r--r-- | bfd/elf-bfd.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index dd9ba6bb36..c05807d184 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -1207,19 +1207,10 @@ struct elf_backend_data asection *(*common_section) (asection *); /* Return TRUE if we can merge 2 definitions. */ - bfd_boolean (*merge_symbol) (struct bfd_link_info *, - struct elf_link_hash_entry **, - struct elf_link_hash_entry *, - Elf_Internal_Sym *, asection **, - bfd_vma *, unsigned int *, - bfd_boolean *, bfd_boolean *, - bfd_boolean *, bfd_boolean *, - bfd_boolean *, bfd_boolean *, - bfd_boolean *, bfd_boolean *, - bfd *, asection **, - bfd_boolean *, bfd_boolean *, - bfd_boolean *, bfd_boolean *, - bfd *, asection **); + bfd_boolean (*merge_symbol) (struct elf_link_hash_entry *, + const Elf_Internal_Sym *, asection **, + bfd_boolean, bfd_boolean, + bfd *, const asection *); /* Return TRUE if symbol should be hashed in the `.gnu.hash' section. */ bfd_boolean (*elf_hash_symbol) (struct elf_link_hash_entry *); @@ -1919,8 +1910,6 @@ extern int _bfd_elf_sizeof_headers (bfd *, struct bfd_link_info *); extern bfd_boolean _bfd_elf_new_section_hook (bfd *, asection *); -extern bfd_boolean _bfd_elf_init_reloc_shdr - (bfd *, struct bfd_elf_section_reloc_data *, asection *, bfd_boolean); extern const struct bfd_elf_special_section *_bfd_elf_get_special_section (const char *, const struct bfd_elf_special_section *, unsigned int); extern const struct bfd_elf_special_section *_bfd_elf_get_sec_type_attr |