aboutsummaryrefslogtreecommitdiff
path: root/bfd/elflink.h
diff options
context:
space:
mode:
authorGeoffrey Keating <geoffk@geoffk.org>2002-01-07 17:55:37 +0000
committerGeoffrey Keating <geoffk@geoffk.org>2002-01-07 17:55:37 +0000
commit47b22aef48233a67b7815c5af7ee0eef671f3ac0 (patch)
tree094d527a3479181e70699a7812c61f861a67d7e3 /bfd/elflink.h
parentceac3f627118f6e5933d38a6726a104bdbd6d7de (diff)
downloadfsf-binutils-gdb-47b22aef48233a67b7815c5af7ee0eef671f3ac0.zip
fsf-binutils-gdb-47b22aef48233a67b7815c5af7ee0eef671f3ac0.tar.gz
fsf-binutils-gdb-47b22aef48233a67b7815c5af7ee0eef671f3ac0.tar.bz2
* elflink.h (elf_link_input_bfd): Don't ask for the merged offset
of a symbol in a section that will be deleted.
Diffstat (limited to 'bfd/elflink.h')
-rw-r--r--bfd/elflink.h2
1 files changed, 2 insertions, 0 deletions
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,