diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2013-03-23 10:25:02 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2013-03-23 10:25:02 +0000 |
| commit | 0d14074418dea8fa209b449fc3d3272ca28f4d62 (patch) | |
| tree | 66e05d37a76669e838989c3d29b653fceda492ed /bfd/elflink.c | |
| parent | c5aca3f984a48150415a0eb23f0992587759662f (diff) | |
| download | binutils-redhat-0d14074418dea8fa209b449fc3d3272ca28f4d62.tar.gz | |
* 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.
Diffstat (limited to 'bfd/elflink.c')
| -rw-r--r-- | bfd/elflink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bfd/elflink.c b/bfd/elflink.c index be53ca3f9d..2da6ac527e 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, |