diff options
-rw-r--r-- | bfd/ChangeLog | 6 | ||||
-rw-r--r-- | bfd/elflink.c | 24 | ||||
-rw-r--r-- | ld/ChangeLog | 6 | ||||
-rw-r--r-- | ld/ldelf.c | 21 |
4 files changed, 42 insertions, 15 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c8fcb3a..0fdc1fa 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2021-01-28 Alan Modra <amodra@gmail.com> + + PR 27259 + * elflink.c (_bfd_elf_gc_mark_extra_sections): Use linker_mark to + prevent endless looping of linked-to sections. + 2020-12-17 Mihails Strasuns <mihails.strasuns@intel.com> * bfd-elf.h (elfcore_write_file_note): New function. diff --git a/bfd/elflink.c b/bfd/elflink.c index 59a6080..47c3fb4 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -13631,15 +13631,23 @@ _bfd_elf_gc_mark_extra_sections (struct bfd_link_info *info, /* Since all sections, except for backend specific ones, have been garbage collected, call mark_hook on this section if any of its linked-to sections is marked. */ - asection *linked_to_sec = elf_linked_to_section (isec); - for (; linked_to_sec != NULL; + asection *linked_to_sec; + for (linked_to_sec = elf_linked_to_section (isec); + linked_to_sec != NULL && !linked_to_sec->linker_mark; linked_to_sec = elf_linked_to_section (linked_to_sec)) - if (linked_to_sec->gc_mark) - { - if (!_bfd_elf_gc_mark (info, isec, mark_hook)) - return FALSE; - break; - } + { + if (linked_to_sec->gc_mark) + { + if (!_bfd_elf_gc_mark (info, isec, mark_hook)) + return FALSE; + break; + } + linked_to_sec->linker_mark = 1; + } + for (linked_to_sec = elf_linked_to_section (isec); + linked_to_sec != NULL && linked_to_sec->linker_mark; + linked_to_sec = elf_linked_to_section (linked_to_sec)) + linked_to_sec->linker_mark = 0; } if (!debug_frag_seen diff --git a/ld/ChangeLog b/ld/ChangeLog index df20606..9dfff4a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2021-01-28 Alan Modra <amodra@gmail.com> + + PR 27259 + * ldelf.c (ldelf_before_place_orphans): Use linker_mark to + prevent endless looping of linked-to sections. + 2021-01-26 H.J. Lu <hongjiu.lu@intel.com> * testsuite/ld-x86-64/bnd-plt-1.d: Fix a typo. @@ -2188,14 +2188,21 @@ ldelf_before_place_orphans (void) been discarded. */ asection *linked_to_sec; for (linked_to_sec = elf_linked_to_section (isec); - linked_to_sec != NULL; + linked_to_sec != NULL && !linked_to_sec->linker_mark; linked_to_sec = elf_linked_to_section (linked_to_sec)) - if (discarded_section (linked_to_sec)) - { - isec->output_section = bfd_abs_section_ptr; - isec->flags |= SEC_EXCLUDE; - break; - } + { + if (discarded_section (linked_to_sec)) + { + isec->output_section = bfd_abs_section_ptr; + isec->flags |= SEC_EXCLUDE; + break; + } + linked_to_sec->linker_mark = 1; + } + for (linked_to_sec = elf_linked_to_section (isec); + linked_to_sec != NULL && linked_to_sec->linker_mark; + linked_to_sec = elf_linked_to_section (linked_to_sec)) + linked_to_sec->linker_mark = 0; } } } |