diff options
| author | Nick Clifton <nickc@redhat.com> | 2016-12-02 14:40:46 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2016-12-02 14:40:46 +0000 |
| commit | 68c638d6e655a937a48770a5df765e6ebbc5b890 (patch) | |
| tree | 701325693106b2faa2db4582b39d5a51c8a5b6bd /ld | |
| parent | 08698b7b46c9c932530dcbcd7e851d27a7d2c503 (diff) | |
| download | binutils-gdb-68c638d6e655a937a48770a5df765e6ebbc5b890.tar.gz | |
Fix seg-fault linking corrupt binary.
PR ld/20912
* emultempl/elf32.em (_place_orphan): Test for ELF format of the
orphan before looking for the SHF_EXCLUDE flag.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/emultempl/elf32.em | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index c4bbe552cfe..e9734ac95b9 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2016-12-02 Nick Clifton <nickc@redhat.com> + + PR ld/20912 + * emultempl/elf32.em (_place_orphan): Test for ELF format of the + orphan before looking for the SHF_EXCLUDE flag. + 2016-12-02 Josh Conner <joshconner@google.com> * Makefile.am: Add dependency information for earmelf_fuchsia.c. diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 36aa7db886d..1fd6313d8f8 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -2062,9 +2062,9 @@ gld${EMULATION_NAME}_place_orphan (asection *s, if (os->bfd_section != NULL && (os->bfd_section->flags == 0 || ((!bfd_link_relocatable (&link_info) - || (((elf_section_flags (s) - ^ elf_section_flags (os->bfd_section)) - & SHF_EXCLUDE) == 0)) + || (iself && (((elf_section_flags (s) + ^ elf_section_flags (os->bfd_section)) + & SHF_EXCLUDE) == 0))) && ((s->flags ^ os->bfd_section->flags) & (SEC_LOAD | SEC_ALLOC)) == 0 && _bfd_elf_match_sections_by_type (link_info.output_bfd, |