darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2008-07-21 H.J. Lu <hongjiu.lu@intel.com>

Browse source 
PR ld/4424
	* elflink.c (_bfd_elf_merge_symbol): Call bed->relocs_compatible
	to check if 2 inputs are compatible.
This commit is contained in:
H.J. Lu 2008-07-21 16:13:27 +00:00
parent 37c43c558f
commit 88ba32a0f9
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bfd/ChangeLog
View file

@ -1,3 +1,9 @@
2008-07-21 H.J. Lu <hongjiu.lu@intel.com>
PR ld/4424
* elflink.c (_bfd_elf_merge_symbol): Call bed->relocs_compatible
to check if 2 inputs are compatible.
2008-07-21 Sterling Augustine <sterling@tensilica.com>
* elf.c (assign_file_positions_for_load_sections): Print vma in

5
bfd/elflink.c
View file

@ -881,9 +881,11 @@ _bfd_elf_merge_symbol (bfd *abfd,
return FALSE;
*sym_hash = h;
bed = get_elf_backend_data (abfd);
/* This code is for coping with dynamic objects, and is only useful
if we are doing an ELF link. */
if (info->output_bfd->xvec != abfd->xvec)
if (!(*bed->relocs_compatible) (abfd->xvec, info->output_bfd->xvec))
return TRUE;
/* For merging, we only care about real symbols. */
@ -970,7 +972,6 @@ _bfd_elf_merge_symbol (bfd *abfd,
&& h->root.type != bfd_link_hash_undefweak
&& h->root.type != bfd_link_hash_common);
bed = get_elf_backend_data (abfd);
/* When we try to create a default indirect symbol from the dynamic
definition with the default version, we skip it if its type and
the type of existing regular definition mismatch. We only do it