From 6d545e31f520d42d921c6164ec592e8d7614d315 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 13 Aug 2017 09:34:04 +0930 Subject: [PATCH] Fix i686-nacl and x86_64-nacl pr21884 failures OUTPUT_FORMAT in the script results in "./ld-new: target elf32-i386 not found" and similarly for the x86_64 test. * testsuite/ld-i386/pr21884.t: Remove unneeded format, arch and entry. * testsuite/ld-x86-64/pr21884.t: Likewise. --- ld/ChangeLog | 5 +++++ ld/testsuite/ld-i386/pr21884.t | 4 ---- ld/testsuite/ld-x86-64/pr21884.t | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index fe06729df06..fdd8d58c170 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2017-08-13 Alan Modra + + * testsuite/ld-i386/pr21884.t: Remove unneeded format, arch and entry. + * testsuite/ld-x86-64/pr21884.t: Likewise. + 2017-08-11 Nick Clifton * emultempl/elf32.em (handle_option): Accept the -z globalaudit diff --git a/ld/testsuite/ld-i386/pr21884.t b/ld/testsuite/ld-i386/pr21884.t index 9ec7dc8614e..fcb7bce20ec 100644 --- a/ld/testsuite/ld-i386/pr21884.t +++ b/ld/testsuite/ld-i386/pr21884.t @@ -1,7 +1,3 @@ -OUTPUT_FORMAT("elf32-i386"); -OUTPUT_ARCH(i386); - -ENTRY(_start); SECTIONS { . = 0x10000; _start = . ; diff --git a/ld/testsuite/ld-x86-64/pr21884.t b/ld/testsuite/ld-x86-64/pr21884.t index f57cb3a601c..fcb7bce20ec 100644 --- a/ld/testsuite/ld-x86-64/pr21884.t +++ b/ld/testsuite/ld-x86-64/pr21884.t @@ -1,7 +1,3 @@ -OUTPUT_FORMAT("elf64-x86-64"); -OUTPUT_ARCH(i386:x86-64); - -ENTRY(_start); SECTIONS { . = 0x10000; _start = . ; -- 2.30.2