MIPS/LD/testsuite: Join `__ehdr_start' tests

Complement commit 3807734dbe48 ("PR ld/15428: MIPS/LD/testsuite:
Un-KFAIL `__ehdr_start' test 2") and join tests that do not need to be
split anymore.

	ld/
	* testsuite/ld-mips-elf/mips-elf.exp: Join `__ehdr_start' tests.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 208c1197f1859861a26a9580a0d054b2249cd811..7f5e389ad2880bc3e3f7e208e5741dc91b30e9eb 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-20  Maciej W. Rozycki  <macro@imgtec.com>
+
+       * testsuite/ld-mips-elf/mips-elf.exp: Join `__ehdr_start' tests.
+
 2017-04-20  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/21382

diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 73d59697a4636fb0bcb313497903a0b1ec771696..3ef996346da8242b66cede1e54d662fa678df46f 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -978,8 +978,7 @@ foreach { abi } $abis {
             "$abi_asflags($abi)" \
             [list ehdr_start-${suff}.s] \
             [list "readelf -s ehdr_start-1.nd"] \
-            "ehdr_start-1-${abi}"]]
-    run_ld_link_tests [list \
+            "ehdr_start-1-${abi}"] \
         [list \
             "MIPS magic __ehdr_start symbol test 2 ($abi)" \
             "$abi_ldflags($abi) -T ehdr_start-2.ld" "" \