OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2004-05-29 H.J. Lu <hongjiu.lu@intel.com>

Browse Source 
* elfxx-ia64.c (elfNN_ia64_relax_section): Undo the last
	change.
This commit is contained in:
H.J. Lu 2004-05-29 19:25:54 +00:00
parent 1698f4e78c
commit 9f2e92c5ac
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2004-05-29 H.J. Lu <hongjiu.lu@intel.com>
* elfxx-ia64.c (elfNN_ia64_relax_section): Undo the last
change.
2004-05-28 DJ Delorie <dj@redhat.com>
* elf-m10300.c (mn10300_elf_relax_section): Preserve reloc addend

23
bfd/elfxx-ia64.c
View File

@ -864,15 +864,6 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
toff = isym->st_value;
dyn_i = get_dyn_sym_info (ia64_info, NULL, abfd, irel, FALSE);
if ((tsec->flags & SEC_MERGE)
&& ELF_ST_TYPE (isym->st_info) == STT_SECTION
&& tsec->sec_info_type == ELF_INFO_TYPE_MERGE)
toff = _bfd_merged_section_offset (abfd, &tsec,
elf_section_data (tsec)->sec_info,
toff + irel->r_addend);
else
toff += irel->r_addend;
}
else
{
@ -917,15 +908,15 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
tsec = h->root.u.def.section;
toff = h->root.u.def.value;
}
if (tsec->sec_info_type == ELF_INFO_TYPE_MERGE)
toff = _bfd_merged_section_offset (abfd, &tsec,
elf_section_data (tsec)->sec_info,
toff + irel->r_addend);
else
toff += irel->r_addend;
}
if (tsec->sec_info_type == ELF_INFO_TYPE_MERGE)
toff = _bfd_merged_section_offset (abfd, &tsec,
elf_section_data (tsec)->sec_info,
toff + irel->r_addend);
else
toff += irel->r_addend;
symaddr = tsec->output_section->vma + tsec->output_offset + toff;
roff = irel->r_offset;