sim: make nrun the default run program

We want people to stop using the run.c frontend, but it's hard to notice
when it's still set as the default.  Lets flip things so nrun.c is the
default, and users of run.c will get an error by default.  We turn that
error into a warning for existing sims so we don't break them -- this is
mostly meant for people starting new ports.

47 files changed, 157 insertions, 37 deletions

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 40d461c..bd4ddf2 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_EXTRA_CFLAGS): Add
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND.
+	(SIM_RUN_OBJS): Set to run.o.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete unistd.h.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index e211496..80271c0 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -17,10 +17,14 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
-SIM_EXTRA_CFLAGS = -DMODET -DNEED_UI_LOOP_HOOK -DSIM_TARGET_SWITCHES
+SIM_EXTRA_CFLAGS = -DMODET -DNEED_UI_LOOP_HOOK -DSIM_TARGET_SWITCHES \
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND
 
 COPRO=@COPRO@
 
+# Use the deprecated run frontend until we migrate to nrun.o
+SIM_RUN_OBJS = run.o
+
 SIM_OBJS = armemu26.o armemu32.o arminit.o armos.o armsupp.o \
 	armvirt.o bag.o thumbemu.o wrapper.o sim-load.o $(COPRO) 
 
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 1f81423..9105e38 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_EXTRA_CFLAGS): Set to
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND.
+	(SIM_RUN_OBJS): Set to run.o.
+
 2015-02-19  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_kill): Delete unused func.
diff --git a/sim/avr/Makefile.in b/sim/avr/Makefile.in
index b767f51..b852211 100644
--- a/sim/avr/Makefile.in
+++ b/sim/avr/Makefile.in
@@ -16,6 +16,11 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
+SIM_EXTRA_CFLAGS = -DSIM_USE_DEPRECATED_RUN_FRONTEND
+
+# Use the deprecated run frontend until we migrate to nrun.o
+SIM_RUN_OBJS = run.o
+
 SIM_OBJS = interp.o sim-load.o
 SIM_EXTRA_LIBS = -lm
 
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 649cb6e..764bad2 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
 2015-03-10  Mike Frysinger  <vapier@gentoo.org>
 
 	PR sim/13160
diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in
index 941ffea..1bf0772 100644
--- a/sim/bfin/Makefile.in
+++ b/sim/bfin/Makefile.in
@@ -20,9 +20,6 @@ NL_TARGET = -DNL_TARGET_bfin
 
 ## COMMON_PRE_CONFIG_FRAG
 
-# List of main object files for `run'.
-SIM_RUN_OBJS = nrun.o
-
 SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	bfin-sim.o \
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 95ae4a4..60d4ba5 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Make-common.in (SIM_RUN_OBJS): Change to nrun.o.
+	* run.c [SIM_USE_DEPRECATED_RUN_FRONTEND]: Issue a warning.
+	[!SIM_USE_DEPRECATED_RUN_FRONTEND]: Throw an error.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* sim-assert.h [!SIM_ASSERT, WITH_ASSERT]: Include sim-io.h.
 	[!ASSERT, WITH_ASSERT]: Likewise.
 	* sim-endian.c: Delete sim-io.h include.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 1d721cd..2004abb 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -139,7 +139,7 @@ SIM_EXTRA_LIBS =
 # List of extra program dependencies.
 SIM_EXTRA_LIBDEPS =
 # List of main object files for `run'.
-SIM_RUN_OBJS = run.o
+SIM_RUN_OBJS = nrun.o
 # Dependency of `all' to build any extra files.
 SIM_EXTRA_ALL =
 # Dependency of `install' to install any extra files.
diff --git a/sim/common/run.c b/sim/common/run.c
index 35bb4e1..e474661 100644
--- a/sim/common/run.c
+++ b/sim/common/run.c
@@ -50,6 +50,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "run-sim.h"
 #include "version.h"
 
+#ifdef SIM_USE_DEPRECATED_RUN_FRONTEND
+# warning "This sim is using the deprecated run.c; please migrate to nrun.c."
+#else
+# error "Please do not create new sim ports using run.c; use nrun.c instead." \
+        "New submissions using run.c will not be accepted."
+#endif
+
 static void usage (int help);
 static void print_version (void);
 extern int optind;
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 9c78613..3a81178 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_EXTRA_CFLAGS): Add
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND.
+	(SIM_RUN_OBJS): Set to run.o.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in
index 6bdd61e..a5a612a 100644
--- a/sim/cr16/Makefile.in
+++ b/sim/cr16/Makefile.in
@@ -17,9 +17,13 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
+# Use the deprecated run frontend until we migrate to nrun.o
+SIM_RUN_OBJS = run.o
+
 SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o
 SIM_EXTRA_CLEAN = clean-extra
-SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT
+SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT \
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND
 
 INCLUDE = cr16_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \
 	$(srcroot)/include/gdb/sim-cr16.h
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index ad903fb..e1f3f9e 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
 2014-12-03  Joel Brobecker  <brobecker@adacore.com>
 
 	* traps.c (cris_break_13_handler): Adjust call to "fstat" callback
diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in
index a4332c8..1281ac3 100644
--- a/sim/cris/Makefile.in
+++ b/sim/cris/Makefile.in
@@ -45,7 +45,6 @@ SIM_EXTRA_DEPS = \
 	$(CGEN_INCLUDE_DEPS) $(srccom)/cgen-ops.h \
 	arch.h cpuall.h cris-sim.h cris-desc.h
 
-SIM_RUN_OBJS = nrun.o
 SIM_EXTRA_CLEAN = cris-clean
 
 # This selects the cris newlib/libgloss syscall definitions.
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 6d94081..728d5af 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_EXTRA_CFLAGS): Add
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND.
+	(SIM_RUN_OBJS): Set to run.o.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index 2b555a5..173fe95 100644
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -17,9 +17,13 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
+# Use the deprecated run frontend until we migrate to nrun.o
+SIM_RUN_OBJS = run.o
+
 SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o
 SIM_EXTRA_CLEAN = clean-extra
-SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT
+SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT \
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND
 
 INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \
 	$(srcroot)/include/gdb/sim-d10v.h
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 47bcb7a..b27c74d 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,5 +1,9 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_RUN_OBJS): Set to sis.o.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
index a60cd8a..4e39549 100644
--- a/sim/erc32/Makefile.in
+++ b/sim/erc32/Makefile.in
@@ -22,6 +22,7 @@ TERMCAP_LIB = @TERMCAP@
 READLINE_LIB = @READLINE@
 
 SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
+SIM_RUN_OBJS = sis.o
 SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
 SIM_EXTRA_ALL = sis
 SIM_EXTRA_INSTALL = install-sis
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index d83bb8d..d54bb94 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
 2014-08-23  Hans-Peter Nilsson  <hp@axis.com>
 
 	* configure.ac: Default simulator hardware to off again.  Remove
diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index ea34bf2..2c1503b 100644
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -43,7 +43,6 @@ SIM_EXTRA_DEPS = \
 
 SIM_EXTRA_CFLAGS = @sim_trapdump@
 
-SIM_RUN_OBJS = nrun.o
 SIM_EXTRA_CLEAN = frv-clean
 
 # This selects the frv newlib/libgloss syscall definitions.
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index ef84be8..ec21cbf 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,5 +1,9 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete stdlib.h & time.h.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/h8300/Makefile.in b/sim/h8300/Makefile.in
index 7a569bd..0333a56 100644
--- a/sim/h8300/Makefile.in
+++ b/sim/h8300/Makefile.in
@@ -17,9 +17,6 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
-# List of main object files for `run'.
-SIM_RUN_OBJS = nrun.o
-
 SIM_OBJS = compile.o \
 	   $(SIM_NEW_COMMON_OBJS) \
 	   sim-cpu.o \
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index dcb133f..58a8605 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
 2014-08-23  Hans-Peter Nilsson  <hp@axis.com>
 
     	* configure.ac: Default simulator hardware to off again
diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in
index 7606b26..57ce255 100644
--- a/sim/iq2000/Makefile.in
+++ b/sim/iq2000/Makefile.in
@@ -44,7 +44,6 @@ SIM_EXTRA_CFLAGS =
 
 ALL_CPU_CFLAGS = -DHAVE_CPU_IQ2000BF -DHAVE_CPU_IQ10BF
 
-SIM_RUN_OBJS = nrun.o
 SIM_EXTRA_CLEAN = iq2000-clean
 
 ## COMMON_POST_CONFIG_FRAG
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 7de4de2..8567e61 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
 2014-08-19  Alan Modra  <amodra@gmail.com>
 
 	* configure: Regenerate.
diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in
index 05cf53b..60420a1 100644
--- a/sim/lm32/Makefile.in
+++ b/sim/lm32/Makefile.in
@@ -25,9 +25,6 @@ SIM_EXTRA_DEPS = $(CGEN_INCLUDE_DEPS) $(srcdir)/../../opcodes/lm32-desc.h
 # List of flags to always pass to $(CC).
 #SIM_EXTRA_CFLAGS =
 
-# List of main object files for `run'.
-SIM_RUN_OBJS = nrun.o
-
 SIM_EXTRA_CLEAN = lm32-clean
 
 # This selects the lm32 newlib/libgloss syscall definitions.
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index b9494af..98f3a8c 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
 2014-08-23  Hans-Peter Nilsson  <hp@axis.com>
 
 	* configure.ac: Default simulator hardware to off again.  Remove
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 12a6a8d..491affd 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -47,7 +47,6 @@ SIM_EXTRA_DEPS = \
 
 SIM_EXTRA_CFLAGS = @sim_extra_cflags@
 
-SIM_RUN_OBJS = nrun.o
 SIM_EXTRA_CLEAN = m32r-clean
 
 # This selects the m32r newlib/libgloss syscall definitions.
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 7ba863a..6e10a38 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,5 +1,9 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in
index fac0b24..f08aa53 100644
--- a/sim/m68hc11/Makefile.in
+++ b/sim/m68hc11/Makefile.in
@@ -20,9 +20,6 @@
 M68HC11_OBJS = interp.o m68hc11int.o m68hc12int.o \
 		emulos.o interrupts.o m68hc11_sim.o
 
-# List of main object files for `run'.
-SIM_RUN_OBJS = nrun.o
-
 SIM_OBJS = $(M68HC11_OBJS) \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-load.o \
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index ce85865..5e3bf17 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_EXTRA_CFLAGS): Set to
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND.
+	(SIM_RUN_OBJS): Set to run.o.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/mcore/Makefile.in b/sim/mcore/Makefile.in
index 5cc9c2f..a1110b2 100644
--- a/sim/mcore/Makefile.in
+++ b/sim/mcore/Makefile.in
@@ -17,6 +17,10 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
+# Use the deprecated run frontend until we migrate to nrun.o
+SIM_RUN_OBJS = run.o
+SIM_EXTRA_CFLAGS = -DSIM_USE_DEPRECATED_RUN_FRONTEND
+
 SIM_OBJS = interp.o sim-load.o
 SIM_EXTRA_LIBS = -lm
 SIM_EXTRA_CLEAN = mcore-clean
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index f043b4b..ceb1dd5 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,5 +1,13 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_EXTRA_CFLAGS): Set to
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND.
+	(SIM_RUN_OBJS): Set to run.o.
+	(SIM_EXTRA_CLEAN): Delete.
+	(interp.o, microblaze-clean): Delete rules.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/microblaze/Makefile.in b/sim/microblaze/Makefile.in
index dda4650..6dc6e4e 100644
--- a/sim/microblaze/Makefile.in
+++ b/sim/microblaze/Makefile.in
@@ -17,12 +17,11 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
+# Use the deprecated run frontend until we migrate to nrun.o
+SIM_RUN_OBJS = run.o
+SIM_EXTRA_CFLAGS = -DSIM_USE_DEPRECATED_RUN_FRONTEND
+
 SIM_OBJS = interp.o sim-load.o
 SIM_EXTRA_LIBS = -lm
-SIM_EXTRA_CLEAN = microblaze-clean
 
 ## COMMON_POST_CONFIG_FRAG
-
-interp.o: interp.c
-
-microblaze-clean:
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 475a10a..72fbdd2 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,5 +1,9 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 985f4e5..67bce7f 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -67,10 +67,6 @@ SIM_EXTRA_ALL = $(SIM_@sim_gen@_ALL)
 
 SIM_EXTRA_LIBS = $(MIPS_EXTRA_LIBS)
 
-# List of main object files for `run'.
-SIM_RUN_OBJS = nrun.o
-
-
 
 ## COMMON_POST_CONFIG_FRAG
 
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index db879f4..b4d84aa 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,5 +1,9 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete unistd.h & stdlib.h &
 	string.h & strings.h & time.h.
 	* aclocal.m4, configure: Regenerate.
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index c94e531..55b0a3f 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -31,9 +31,6 @@ MN10300_OBJS = \
 
 SIM_OBJS = $(MN10300_OBJS) interp.o
 
-# List of main object files for `run'.
-SIM_RUN_OBJS = nrun.o
-
 SIM_EXTRA_CLEAN = clean-igen
 # Extra dependencies for "sim-main.h"
 SIM_EXTRA_DEPS = mn10300_sim.h itable.h idecode.h
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 1b0e892..8e2f5fb 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_EXTRA_CFLAGS): Set to
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND.
+	(SIM_RUN_OBJS): Set to run.o.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index dafdf8c..1f7587c 100644
--- a/sim/moxie/Makefile.in
+++ b/sim/moxie/Makefile.in
@@ -19,6 +19,10 @@
 
 dtbdir = @datadir@/gdb/dtb
 
+# Use the deprecated run frontend until we migrate to nrun.o
+SIM_RUN_OBJS = run.o
+SIM_EXTRA_CFLAGS = -DSIM_USE_DEPRECATED_RUN_FRONTEND
+
 SIM_OBJS = interp.o sim-load.o sim-io.o sim-config.o sim-utils.o	\
 sim-options.o sim-module.o sim-core.o sim-endian.o sim-trace.o 	\
 sim-engine.o sim-fpu.o sim-bits.o sim-profile.o sim-events.o \
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 9ec71ec..7d52dca 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
 2015-02-24  Nick Clifton  <nickc@redhat.com>
 
 	* msp430-sim.c (sim_open): Allocate memory regions matching those
diff --git a/sim/msp430/Makefile.in b/sim/msp430/Makefile.in
index e398d0d..2034867 100644
--- a/sim/msp430/Makefile.in
+++ b/sim/msp430/Makefile.in
@@ -47,8 +47,6 @@ SIM_EXTRA_CFLAGS =
 SIM_EXTRA_LIBS =
 # List of extra program dependencies.
 SIM_EXTRA_LIBDEPS =
-# List of main object files for `run'.
-SIM_RUN_OBJS = nrun.o
 # Dependency of `all' to build any extra files.
 SIM_EXTRA_ALL =
 # Dependency of `install' to install any extra files.
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index cbeab34..8603da5 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_EXTRA_CFLAGS): Set to
+	-DSIM_USE_DEPRECATED_RUN_FRONTEND.
+	(SIM_RUN_OBJS): Set to run.o.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete.
 	* aclocal.m4, configure: Regenerate.
 
diff --git a/sim/sh/Makefile.in b/sim/sh/Makefile.in
index b999e67..61422ab 100644
--- a/sim/sh/Makefile.in
+++ b/sim/sh/Makefile.in
@@ -17,6 +17,10 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
+# Use the deprecated run frontend until we migrate to nrun.o
+SIM_RUN_OBJS = run.o
+SIM_EXTRA_CFLAGS = -DSIM_USE_DEPRECATED_RUN_FRONTEND
+
 SIM_OBJS = interp.o table.o sim-load.o
 SIM_EXTRA_LIBS = -lm
 SIM_EXTRA_CLEAN = sh-clean
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 05d0329..43eee86 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
 2014-08-23  Hans-Peter Nilsson  <hp@axis.com>
 
     	* configure.ac: Default simulator hardware to off again
diff --git a/sim/sh64/Makefile.in b/sim/sh64/Makefile.in
index 0022d8e..6c23ad9 100644
--- a/sim/sh64/Makefile.in
+++ b/sim/sh64/Makefile.in
@@ -44,7 +44,6 @@ SIM_EXTRA_DEPS = \
 
 SIM_EXTRA_CFLAGS =
 
-SIM_RUN_OBJS = nrun.o
 SIM_EXTRA_CLEAN = sh64-clean
 
 ## COMMON_POST_CONFIG_FRAG
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index f02be2b..8578b8a 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,5 +1,9 @@
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (SIM_RUN_OBJS): Delete.
+
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (AC_CHECK_HEADERS): Delete unistd.h & stdlib.h &
 	string.h & strings.h & time.h.
 	* aclocal.m4, configure: Regenerate.
diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in
index 067158f..c8ccde0 100644
--- a/sim/v850/Makefile.in
+++ b/sim/v850/Makefile.in
@@ -30,8 +30,6 @@ SIM_OBJS = \
 	sim-reason.o \
 	sim-stop.o
 
-SIM_RUN_OBJS = nrun.o
-
 # List of extra dependencies.
 # Generally this consists of simulator specific files included by sim-main.h.
 SIM_EXTRA_DEPS = v850_sim.h sim-main.h simops.h itable.h