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.
This commit is contained in:
parent
70b0cf90bc
commit
b8f4abd342
|
@ -1,3 +1,7 @@
|
|||
2017-08-02 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* emultempl/elf32.em (_place_orphan): Revert the last change.
|
||||
|
||||
2017-08-02 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* emultempl/xtensaelf.em (xtensa_wild_group_interleave_callback):
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue