Revert "Also check e_machine when merging sections"
authorAlan Modra <amodra@gmail.com>
Wed, 30 Sep 2015 22:08:07 +0000 (07:38 +0930)
committerAlan Modra <amodra@gmail.com>
Wed, 30 Sep 2015 22:11:28 +0000 (07:41 +0930)
commit017e6bceee1a96d4b57175687560b4d625fdb150
tree32f78790e80baf3f1ad994b11eba7fabca7aea9a
parent1fd60fc077da09a3ae8f20a8b3f5f88b413c7237
Revert "Also check e_machine when merging sections"

Commit 9865bd0d added a bogus check in _bfd_elf_merge_sections.

bfd/
PR ld/19013
* elflink.c (_bfd_elf_merge_sections): Revert last change.
ld/testsuite/
* ld-x86-64/pr19013-x32.d: Update.
bfd/ChangeLog
bfd/elflink.c
ld/testsuite/ChangeLog
ld/testsuite/ld-x86-64/pr19013-x32.d