diff options
| author | H.J. Lu <hjl@lucon.org> | 2005-02-28 15:57:13 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@lucon.org> | 2005-02-28 15:57:13 +0000 |
| commit | 9988ec7fc9781e681398821f010e8715ae525f26 (patch) | |
| tree | 700a2ac31d42d2ce219c817187201970bd9c4aaa /bfd/elf32-sh-symbian.c | |
| parent | 1c689071dc9a8a84450930cd82f68b2490b4b222 (diff) | |
| download | gdb-9988ec7fc9781e681398821f010e8715ae525f26.tar.gz | |
2005-02-28 H.J. Lu <hongjiu.lu@intel.com>
PR 757
* elf-bfd.h (_bfd_elf_merge_symbol): Add a pointer to unsigned
int.
* elf32-sh-symbian.c (sh_symbian_relocate_section): Pass NULL
to _bfd_elf_merge_symbol.
* elflink.c (_bfd_elf_merge_symbol): Use the pointer to
unsigned int to return the alignment of the old common symbol
in the dynamic object.
(_bfd_elf_add_default_symbol): Pass NULL to
_bfd_elf_merge_symbol.
(elf_link_add_object_symbols): Pass &old_alignment to
_bfd_elf_merge_symbol. Get the alignment of the new common
symbol in the dynamic object.
Diffstat (limited to 'bfd/elf32-sh-symbian.c')
| -rw-r--r-- | bfd/elf32-sh-symbian.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bfd/elf32-sh-symbian.c b/bfd/elf32-sh-symbian.c index 8b15606dde4..6a74f575bcf 100644 --- a/bfd/elf32-sh-symbian.c +++ b/bfd/elf32-sh-symbian.c @@ -492,8 +492,11 @@ sh_symbian_relocate_section (bfd * output_bfd, new_sym.st_other = ELF_ST_VISIBILITY (STV_DEFAULT); new_sym.st_shndx = SHN_UNDEF; - if (! _bfd_elf_merge_symbol (input_bfd, info, ptr->new_name, & new_sym, & psec, - & new_value, & new_hash, & skip, & override, & type_change_ok, + if (! _bfd_elf_merge_symbol (input_bfd, info, + ptr->new_name, & new_sym, + & psec, & new_value, NULL, + & new_hash, & skip, + & override, & type_change_ok, & size_change_ok)) { _bfd_error_handler (_("%B: Failed to add renamed symbol %s"), |