From b8f4abd342cc54bc2b90c796a2aae93e6c3bda6b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 2 Aug 2017 05:08:41 -0700 Subject: [PATCH] Revert the last change to emultempl/elf32.em It will be replaced by a different fix. * emultempl/elf32.em (_place_orphan): Revert the last change. --- ld/ChangeLog | 4 ++++ ld/emultempl/elf32.em | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index ff99df4f3c..14c6edd5d1 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2017-08-02 H.J. Lu + + * emultempl/elf32.em (_place_orphan): Revert the last change. + 2017-08-02 Max Filippov * emultempl/xtensaelf.em (xtensa_wild_group_interleave_callback): diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 8cdcc6c7f9..d2551b6f2c 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -2150,8 +2150,6 @@ gld${EMULATION_NAME}_place_orphan (asection *s, one of them has SHF_EXCLUDE. Don't merge 2 sections with different sh_info. */ if (os->bfd_section != NULL - /* PR 21884: Don't merge non-ELF sections. */ - && bfd_get_flavour (os->bfd_section->owner) == bfd_target_elf_flavour && (elf_section_data (os->bfd_section)->this_hdr.sh_info == elf_section_data (s)->this_hdr.sh_info) && (os->bfd_section->flags == 0