diff options
| author | Alan Modra <amodra@gmail.com> | 2016-12-15 21:29:44 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-12-15 23:53:49 +1030 |
| commit | a961cdd5f139d3c3e09170db52bd8df7dafae13f (patch) | |
| tree | aa1a18c481aac0b999e9109d7af8736b3ad0e7ec | |
| parent | 02aa377fbdd17b763b1e32ad72ccfd1c617ce463 (diff) | |
| download | gdb-a961cdd5f139d3c3e09170db52bd8df7dafae13f.zip gdb-a961cdd5f139d3c3e09170db52bd8df7dafae13f.tar.gz gdb-a961cdd5f139d3c3e09170db52bd8df7dafae13f.tar.bz2 | |
Linking non-ELF file broken by PR20908 fix
PR ld/20968
PR ld/20908
* elflink.c (bfd_elf_final_link): Revert 2016-12-02 change. Move
reloc counting code later after ELF flavour test.
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elflink.c | 51 |
2 files changed, 30 insertions, 28 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ded152e..46cb383 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2016-12-15 Alan Modra <amodra@gmail.com> + + PR ld/20968 + PR ld/20908 + * elflink.c (bfd_elf_final_link): Revert 2016-12-02 change. Move + reloc counting code later after ELF flavour test. + 2016-12-14 Maciej W. Rozycki <macro@imgtec.com> * bfd-in.h (elf_internal_abiflags_v0): New struct declaration. diff --git a/bfd/elflink.c b/bfd/elflink.c index 9b4482d..fe6662d 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -11345,13 +11345,6 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info) asection *sec; sec = p->u.indirect.section; - /* See PR 20908 for a reproducer. */ - if (bfd_get_flavour (sec->owner) != bfd_target_elf_flavour) - { - _bfd_error_handler (_("%B: not in ELF format"), sec->owner); - goto error_return; - } - esdi = elf_section_data (sec); /* Mark all sections which are to be included in the link. This will normally be every section. We need @@ -11362,37 +11355,18 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info) if (sec->flags & SEC_MERGE) merged = TRUE; - if (esdo->this_hdr.sh_type == SHT_REL - || esdo->this_hdr.sh_type == SHT_RELA) - /* Some backends use reloc_count in relocation sections - to count particular types of relocs. Of course, - reloc sections themselves can't have relocations. */ - reloc_count = 0; - else if (emit_relocs) - { - reloc_count = sec->reloc_count; - if (bed->elf_backend_count_additional_relocs) - { - int c; - c = (*bed->elf_backend_count_additional_relocs) (sec); - additional_reloc_count += c; - } - } - else if (bed->elf_backend_count_relocs) - reloc_count = (*bed->elf_backend_count_relocs) (info, sec); - if (sec->rawsize > max_contents_size) max_contents_size = sec->rawsize; if (sec->size > max_contents_size) max_contents_size = sec->size; - /* We are interested in just local symbols, not all - symbols. */ if (bfd_get_flavour (sec->owner) == bfd_target_elf_flavour && (sec->owner->flags & DYNAMIC) == 0) { size_t sym_count; + /* We are interested in just local symbols, not all + symbols. */ if (elf_bad_symtab (sec->owner)) sym_count = (elf_tdata (sec->owner)->symtab_hdr.sh_size / bed->s->sizeof_sym); @@ -11406,6 +11380,27 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info) && elf_symtab_shndx_list (sec->owner) != NULL) max_sym_shndx_count = sym_count; + if (esdo->this_hdr.sh_type == SHT_REL + || esdo->this_hdr.sh_type == SHT_RELA) + /* Some backends use reloc_count in relocation sections + to count particular types of relocs. Of course, + reloc sections themselves can't have relocations. */ + ; + else if (emit_relocs) + { + reloc_count = sec->reloc_count; + if (bed->elf_backend_count_additional_relocs) + { + int c; + c = (*bed->elf_backend_count_additional_relocs) (sec); + additional_reloc_count += c; + } + } + else if (bed->elf_backend_count_relocs) + reloc_count = (*bed->elf_backend_count_relocs) (info, sec); + + esdi = elf_section_data (sec); + if ((sec->flags & SEC_RELOC) != 0) { size_t ext_size = 0; |