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

* elf-m10300.c (mn10300_elf_relax_section): Use _bfd_merged_section_offset

Browse source 
to compute the offset of a symbol in a merged section.
This commit is contained in:
Nick Clifton 2007-12-31 11:29:31 +00:00
parent e9e9cead3f
commit 281153f387
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bfd/ChangeLog
View file

@ -1,3 +1,9 @@
2007-12-31 Nick Clifton <nickc@redhat.com>
* elf-m10300.c (mn10300_elf_relax_section): Use
_bfd_merged_section_offset to compute the offset of a symbol in a
merged section.
2007-12-31 Nick Clifton <nickc@redhat.com>
* elf.c (_bfd_elf_find_segment_containing_section): New function:

11
bfd/elf-m10300.c
View file

@ -2813,12 +2813,11 @@ mn10300_elf_relax_section (bfd *abfd,
&& ELF_ST_TYPE (isym->st_info) == STT_SECTION
&& sym_sec->sec_info_type == ELF_INFO_TYPE_MERGE)
{
bfd_vma saved_addend;
saved_addend = irel->r_addend;
symval = _bfd_elf_rela_local_sym (abfd, isym, & sym_sec, irel);
symval += irel->r_addend;
irel->r_addend = saved_addend;
symval = isym->st_value + irel->r_addend;
symval = _bfd_merged_section_offset (abfd, & sym_sec,
elf_section_data (sym_sec)->sec_info,
symval);
symval += sym_sec->output_section->vma + sym_sec->output_offset - irel->r_addend;
}
else
symval = (isym->st_value