Do unset_currtarget_info ldscript for all simulator testsuites.

sim/testsuite:
	* sim-defs.exp (sim_init): Unset target ldscript here.

sim/testsuite/sim/mips:
	* basic.exp: Don't unset target ldscript here.

diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index 6bae4e5a9a1e7a3c8f9d3644353577eca2278de7..20038f1916765053c339ef2cd06595becfd7d162 100644 (file)
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-13  Hans-Peter Nilsson  <hp@axis.com>
+
+       * sim-defs.exp (sim_init): Unset target ldscript here.
+
 2015-03-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Add d10v-*-elf.

diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index fb2346a60da01ab9cfbd9426dbd3ee997d77829a..2faf5dcab8d96d56115720eff6f12b595220d9e1 100644 (file)
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -12,6 +12,16 @@ proc sim_init { args } {
     global sim_path
     set sim_path [board_info target sim]
     # Need to return an empty string (copied from GAS).
+
+    # As gross as it is, we unset the linker script specified by the target
+    # board.  The simulator board file mips-sim.exp, sets ldscript to the
+    # MIPS libgloss linker scripts which include libgcc (and possibly other
+    # libraries), which the linker (used to link these tests rather than the
+    # compiler) can't necessarily find.  Similarly iq2000-sim.exp and
+    # m68hc11-sim.exp.  So, we make it a common rule to clear the slate for
+    # all simulators.
+    unset_currtarget_info ldscript
+
     return ""
 }
 

diff --git a/sim/testsuite/sim/mips/ChangeLog b/sim/testsuite/sim/mips/ChangeLog
index 550514417848b0058789e007df390785cf325745..d2080d1e17dc1c3eeca1e4bbb4b3762fe4b80a19 100644 (file)
--- a/sim/testsuite/sim/mips/ChangeLog
+++ b/sim/testsuite/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-13  Hans-Peter Nilsson  <hp@axis.com>
+
+       * basic.exp: Don't unset target ldscript here.
+
 2011-01-06  Hans-Peter Nilsson  <hp@axis.com>
 
        * testutils.inc: Correct comment syntax fallout from

diff --git a/sim/testsuite/sim/mips/basic.exp b/sim/testsuite/sim/mips/basic.exp
index 1c78c871740971f27e60d15881e121f6a4df368d..ddef53544a2b0f68dcaaa7026c490983a1d3e72b 100644 (file)
--- a/sim/testsuite/sim/mips/basic.exp
+++ b/sim/testsuite/sim/mips/basic.exp
@@ -1,11 +1,5 @@
 # MIPS simulator instruction tests
 
-# As gross as it is, we unset the linker script specified by the target
-# board.  The MIPS libgloss linker scripts include libgcc (and possibly
-# other libraries), which the linker (used to link these tests rather
-# than the compiler) can't necessarily find.
-unset_currtarget_info ldscript
-
 # Do "run_sim_test TESTFILE MODELS" for each combination of the
 # mf{lo,hi} -> mult/div/mt{lo,hi} hazard described in mips.igen.
 # Insert NOPS nops after the mflo or mfhi.