diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2004-05-29 19:25:54 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2004-05-29 19:25:54 +0000 |
| commit | 9f2e92c5ac8a732fa9fd3d364b91cde0f262f310 (patch) | |
| tree | 20bb3616f88ec6d2cab79a7cb9eeb53fc569e9de /bfd | |
| parent | 1698f4e78cafab1397b9ac280bffcffc6ac62f72 (diff) | |
| download | binutils-9f2e92c5ac8a732fa9fd3d364b91cde0f262f310.zip binutils-9f2e92c5ac8a732fa9fd3d364b91cde0f262f310.tar.gz binutils-9f2e92c5ac8a732fa9fd3d364b91cde0f262f310.tar.bz2 | |
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')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfxx-ia64.c | 23 |
2 files changed, 12 insertions, 16 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 52c3584..afca5c3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -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 diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c index f72df9e..26b2e45 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; |