diff options
| author | Nick Clifton <nickc@redhat.com> | 2020-03-24 13:35:53 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2020-03-24 13:35:53 +0000 |
| commit | ec2e748ad396c868839c977aa27d0333eb085970 (patch) | |
| tree | 541c375a5a7d59607a8615badfccbc34dde593dc | |
| parent | cda7e5603f6efd7c3716e45cc6ea11b70dd8daae (diff) | |
| download | binutils-ec2e748ad396c868839c977aa27d0333eb085970.zip binutils-ec2e748ad396c868839c977aa27d0333eb085970.tar.gz binutils-ec2e748ad396c868839c977aa27d0333eb085970.tar.bz2 | |
Fix assertion failure in the BFD library when linking with --emit-relocs enabled.
PR 25681
* elf.c (_bfd_elf_map_sections_to_segments): When looking for a
segment to use for PT_GNU_RELRO, ignore empty sections in a
segment's current list.
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elf.c | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8ec3782..d9e1139 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2020-03-24 Nick Clifton <nickc@redhat.com> + + PR 25681 + * elf.c (_bfd_elf_map_sections_to_segments): When looking for a + segment to use for PT_GNU_RELRO, ignore empty sections in a + segment's current list. + 2020-03-24 H.J. Lu <hongjiu.lu@intel.com> PR binutils/25717 @@ -5213,9 +5213,12 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info) { i = m->count; while (--i != (unsigned) -1) - if ((m->sections[i]->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) - == (SEC_LOAD | SEC_HAS_CONTENTS)) - break; + { + if (m->sections[i]->size > 0 + && (m->sections[i]->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) + == (SEC_LOAD | SEC_HAS_CONTENTS)) + break; + } if (i != (unsigned) -1) break; |