summaryrefslogtreecommitdiff
path: root/bfd/elfxx-ia64.c
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2004-05-29 19:25:54 +0000
committerH.J. Lu <hjl.tools@gmail.com>2004-05-29 19:25:54 +0000
commit9f2e92c5ac8a732fa9fd3d364b91cde0f262f310 (patch)
tree20bb3616f88ec6d2cab79a7cb9eeb53fc569e9de /bfd/elfxx-ia64.c
parent1698f4e78cafab1397b9ac280bffcffc6ac62f72 (diff)
downloadbinutils-9f2e92c5ac8a732fa9fd3d364b91cde0f262f310.tar.gz
binutils-9f2e92c5ac8a732fa9fd3d364b91cde0f262f310.tar.bz2
binutils-9f2e92c5ac8a732fa9fd3d364b91cde0f262f310.zip
2004-05-29 H.J. Lu <hongjiu.lu@intel.com>
* elfxx-ia64.c (elfNN_ia64_relax_section): Undo the last change.
Diffstat (limited to 'bfd/elfxx-ia64.c')
-rw-r--r--bfd/elfxx-ia64.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index f72df9e1f14..26b2e455488 100644
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -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;