From 017e6bceee1a96d4b57175687560b4d625fdb150 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 1 Oct 2015 07:38:07 +0930
Subject: 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.
---
 ld/testsuite/ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ld/testsuite/ChangeLog')

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index e73d09f..b8724af 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-01  Alan Modra  <amodra@gmail.com>
+
+	* ld-x86-64/pr19013-x32.d: Update.
+
 2015-09-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld-x86-64/pr19013.d (ld): Add -m elf_x86_64.
-- 
cgit v1.1