From 017e6bceee1a96d4b57175687560b4d625fdb150 Mon Sep 17 00:00:00 2001 From: Alan Modra 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 ++++ ld/testsuite/ld-x86-64/pr19013-x32.d | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'ld') 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 + + * ld-x86-64/pr19013-x32.d: Update. + 2015-09-30 H.J. Lu * 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 -- cgit v1.1