aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2015-10-01 07:38:07 +0930
committerAlan Modra <amodra@gmail.com>2015-10-01 07:41:28 +0930
commit017e6bceee1a96d4b57175687560b4d625fdb150 (patch)
tree32f78790e80baf3f1ad994b11eba7fabca7aea9a /ld
parent1fd60fc077da09a3ae8f20a8b3f5f88b413c7237 (diff)
downloadfsf-binutils-gdb-017e6bceee1a96d4b57175687560b4d625fdb150.zip
fsf-binutils-gdb-017e6bceee1a96d4b57175687560b4d625fdb150.tar.gz
fsf-binutils-gdb-017e6bceee1a96d4b57175687560b4d625fdb150.tar.bz2
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.
Diffstat (limited to 'ld')
-rw-r--r--ld/testsuite/ChangeLog4
-rw-r--r--ld/testsuite/ld-x86-64/pr19013-x32.d2
2 files changed, 5 insertions, 1 deletions
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.
diff --git a/ld/testsuite/ld-x86-64/pr19013-x32.d b/ld/testsuite/ld-x86-64/pr19013-x32.d
index fb70966..97fb841 100644
--- a/ld/testsuite/ld-x86-64/pr19013-x32.d
+++ b/ld/testsuite/ld-x86-64/pr19013-x32.d
@@ -5,5 +5,5 @@
#notarget: x86_64-*-nacl*
#...
- [0-9a-f]+ 00000203 00414243 4400 +.....ABCD. +
+ [0-9a-f]+ 02030041 42434400 +...ABCD. +
#pass