diff options
| author | Alan Modra <amodra@gmail.com> | 2013-03-23 10:25:02 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2013-03-23 10:25:02 +0000 |
| commit | 8a56bd02519985bc5f86fbe7bff927018d5880e6 (patch) | |
| tree | 53678c0e6f118ce4fa7fe486454e087ac7e4f59b /bfd/elflink.c | |
| parent | eed23bb4a19f8af428d2dea636dfe2c7fd12178e (diff) | |
| download | gdb-8a56bd02519985bc5f86fbe7bff927018d5880e6.zip gdb-8a56bd02519985bc5f86fbe7bff927018d5880e6.tar.gz gdb-8a56bd02519985bc5f86fbe7bff927018d5880e6.tar.bz2 | |
* 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 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, |