From 8a56bd02519985bc5f86fbe7bff927018d5880e6 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 23 Mar 2013 10:25:02 +0000 Subject: * elf-bfd.h (_bfd_elf_merge_symbol): Delete declaration. * elflink.c (_bfd_elf_merge_symbol): Make static. * elf32-sh-symbian.c (sh_symbian_relocate_section): Don't call _bfd_elf_merge_symbol, call _bfd_generic_link_add_one_symbol. --- bfd/elflink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bfd/elflink.c') diff --git a/bfd/elflink.c b/bfd/elflink.c index be53ca3..2da6ac5 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -907,7 +907,7 @@ elf_merge_st_other (bfd *abfd, struct elf_link_hash_entry *h, change. We set POLD_ALIGNMENT if an old common symbol in a dynamic object is overridden by a regular object. */ -bfd_boolean +static bfd_boolean _bfd_elf_merge_symbol (bfd *abfd, struct bfd_link_info *info, const char *name, -- cgit v1.1