diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2002-01-15 12:52:15 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2002-01-15 12:52:15 +0000 |
| commit | d3c456e9506b08668419af641c7b14be84ec73ac (patch) | |
| tree | b952ee6248ac6bb1f2cbde9d72ef7ea589137a8c /bfd/elflink.h | |
| parent | 8b8c5dbda54c48219d5e6dbba8ff9ab3594689c1 (diff) | |
| download | fsf-binutils-gdb-d3c456e9506b08668419af641c7b14be84ec73ac.zip fsf-binutils-gdb-d3c456e9506b08668419af641c7b14be84ec73ac.tar.gz fsf-binutils-gdb-d3c456e9506b08668419af641c7b14be84ec73ac.tar.bz2 | |
* elflink.h (elf_link_input_bfd): Back out 2002-01-07 change.
* elf.c (merge_sections_remove_hook): New function.
(_bfd_elf_merge_sections): Pass it as 3rd argument to
_bfd_merge_sections.
* libbfd-in.h (_bfd_merge_sections): Add 3rd argument.
* libbfd.h: Rebuilt.
* merge.c (_bfd_merge_sections): Add remove_hook argument.
Call remove_hook if a SEC_EXCLUDE section is encountered.
Diffstat (limited to 'bfd/elflink.h')
| -rw-r--r-- | bfd/elflink.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/bfd/elflink.h b/bfd/elflink.h index d465bcc..9a3bfd3 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -6375,8 +6375,6 @@ 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, |