diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elflink.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 15c720e..fcabcaa 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2002-01-07 Geoffrey Keating <geoffk@redhat.com> + + * elflink.h (elf_link_input_bfd): Don't ask for the merged offset + of a symbol in a section that will be deleted. + 2002-01-07 Nick Clifton <nickc@cambridge.redhat.com> * po/es.po: New file: Spanish translation. diff --git a/bfd/elflink.h b/bfd/elflink.h index 9a3bfd3..d465bcc 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -6375,6 +6375,8 @@ elf_link_input_bfd (finfo, input_bfd) isec = section_from_elf_index (input_bfd, isym->st_shndx); if (isec && elf_section_data (isec)->sec_info_type == ELF_INFO_TYPE_MERGE + && (finfo->info->relocateable + || ! (isec->flags & SEC_EXCLUDE)) && ELF_ST_TYPE (isym->st_info) != STT_SECTION) isym->st_value = _bfd_merged_section_offset (output_bfd, &isec, |