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.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 40d461c29e4202d3bc9362df1cb7d1cd35db7423..bd4ddf225211f50e958db9134d33c0217b4288a3 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index e21149640a5c7688068a23f06cb10fab55926272..80271c060f657f431c8071819b06707ce2f2d21b 100644 (file)
--- 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 1f81423fac95922a1f179d197fbac8cd1be7afa9..9105e38f0c6e82c18e97d224fc1a7d18a9b867bd 100644 (file)
--- 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 b767f51b698a66443ea9f931c40a434b67988980..b852211b07e99369cb925c2483a538ef246b1e3d 100644 (file)
--- 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 649cb6e068bbe0173f917e3d5409a3a11c8df14a..764bad2e1f8cc1fb8e63f7e89676ea231c4d6e1c 100644 (file)
--- 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 941ffea373920a19af45b27deb16c2e45e390bde..1bf0772ea0863560ed2182f6753886caa100ba1a 100644 (file)
--- 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 95ae4a47df8889a895b540f34bcdf8374acd76e0..60d4ba56c12ffd79535a4024f8e92eaac7d809dc 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 1d721cdea7cb60fd06cb69e1f4ff2dbb5f2cb1b7..2004abb5fd46c6a26fc28b5a06c6a48499a2e4a8 100644 (file)
--- 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 35bb4e14726e5cf81cf17e4a45e015372e9aac6e..e4746619d7319c02cc32f315a91117f5d5a333bb 100644 (file)
--- 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 9c78613b7302b3c0d163dc8de5404f8d6d6238f0..3a81178bfe9063a35ccaf63a62cf6192843f6262 100644 (file)
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in
index 6bdd61ecfb3636fa8ced24463174906b068d3edb..a5a612a50eb50b6e8acb4df23fa04844eabd56c3 100644 (file)
--- 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 ad903fb2f1b9b58c28c012d68bf3e2506da8e5c7..e1f3f9efa3bcba3949a7ebad597449c886113bb1 100644 (file)
--- 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 a4332c8e9898c5415078de060c37ccba8f83a7cb..1281ac39547b7dac80b57731027cd767a7fe5f20 100644 (file)
--- 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 6d940812029c4c88d43ce7c55e938776a755f929..728d5af5b9fced4bc26cffdcd4fa3c25020b8823 100644 (file)
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index 2b555a553228fea9586456b252fb5062dd498e43..173fe95ec92fe1e5fcb20f2b8f92be644e1872bc 100644 (file)
--- 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 47bcb7a9a4042be7ca72379c033edf164d547242..b27c74d259b0f869dca1daf45f53111c9a16e83f 100644 (file)
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
index a60cd8a8ec6c225f7e797881b49fdfecee7c822b..4e39549ef53bd72850958f0b6cc4088224d892ce 100644 (file)
--- 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 d83bb8d03e6e36104aad7cab1efed25ac4e2d5f3..d54bb94312db7cc9763840aea3a85e4555246112 100644 (file)
--- 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 ea34bf2956ebf8ebff222e53ad74794827e146ac..2c1503b166d7962332f0c77375cc36b6c410e64c 100644 (file)
--- 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 ef84be80bc18fd90710fab211374c1a4364d3896..ec21cbfb77d7dfc0c15edd35b9ef0fd782797302 100644 (file)
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/sim/h8300/Makefile.in b/sim/h8300/Makefile.in
index 7a569bd20f33857010f86eb106dd5c43efd8c17b..0333a569152e1e5922e1cde21991caf98b0be4b5 100644 (file)
--- 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 dcb133f81a8bc7c9795081c96ad26ef7c65047bf..58a8605805f93801ba394297b205478612f65e95 100644 (file)
--- 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 7606b26a53f023acd1e348cd184347a3340bc0c1..57ce2559e4ac38b1ba1da5f9e16f87970b0d7b65 100644 (file)
--- 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 7de4de2f0a186ab656f87f806f5a840f3c5d01ba..8567e61e4df1aae534b08d2ab3a9c43217df3c74 100644 (file)
--- 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 05cf53b4dd548d8f5462a9207f2e2450479eb2f4..60420a1d0ad30d3ff10fae6fbba828ecd71c4f6d 100644 (file)
--- 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 b9494afb229b4b9410a6f9ae75a51a45f93e90f6..98f3a8cb6cc34e16b5e6af69bf64cd9202645374 100644 (file)
--- 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 12a6a8d16288f1503592d55de988c5b0def7eb6a..491affd4c85135b7f231cebb8dadea4a2bef8b2b 100644 (file)
--- 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 7ba863a50468aa3a6348b989b9323007cc9bffa2..6e10a382d12b2d15e7ee6b9c2272fda76d26c764 100644 (file)
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in
index fac0b248a05037a7b3d20f3f01295126a863773e..f08aa537a19b307e4c568c991068d34a54d4b8bd 100644 (file)
--- 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 ce85865dadcac9edc597f02da5dbeb4253b603bd..5e3bf17058c92a4a3efc9cfa872948a1d1335d3a 100644 (file)
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/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-03-14  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac (AC_CHECK_HEADERS): Delete.

diff --git a/sim/mcore/Makefile.in b/sim/mcore/Makefile.in
index 5cc9c2f8f44bd6e63f7f4cc9c5e0f8acf25c0d8f..a1110b2cb3f75f0e7941125ceb5061d7eef7b39b 100644 (file)
--- 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 f043b4bdcf2054692199c99d055526f22623f00a..ceb1dd5b2c1e0edc8c4e1302a2dbdf579385de5f 100644 (file)
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +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.
+       (SIM_EXTRA_CLEAN): Delete.
+       (interp.o, microblaze-clean): Delete rules.
+
 2015-03-14  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac (AC_CHECK_HEADERS): Delete.

diff --git a/sim/microblaze/Makefile.in b/sim/microblaze/Makefile.in
index dda46501f13b26105ec9cf2f8b568d78266f6a06..6dc6e4e358e398640891d90bba545d69ad4e859d 100644 (file)
--- 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 475a10a88d72302ad33f4dc3f97562be2161ce75..72fbdd2fc603d65696ccf98869e10e1117b93740 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 985f4e50abd78ae403e5460bef00fa4cb33ef52d..67bce7faf3f513c41305dd745dc327d39f923a42 100644 (file)
--- 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 db879f4764fa7c2221ed52433b0c80d88807c7ee..b4d84aa7067643359cf003208579a053b98152de 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+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 &

diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index c94e531beecd68e965f0309dbd08c5a3c28c7cf0..55b0a3f23a13aeb606d567689971aa9f6b6712f1 100644 (file)
--- 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 1b0e892c195c2ce984e726b1b461b03eeaec87dd..8e2f5fbe9c6999d8e75665dfe46e4a4c0fc4714b 100644 (file)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/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-03-14  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac (AC_CHECK_HEADERS): Delete.

diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index dafdf8c9b4a097b783e50b3df17e88e0226acea5..1f7587c5799021246e71f4d627124edf367e729c 100644 (file)
--- 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 9ec71ecb52c476177f9ce5e28d6f7273dccd2766..7d52dca2f5aadba5bd5cd707b87445a681df3626 100644 (file)
--- 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 e398d0da5a1e9b5e5db32d26cbfc66bf338f2379..20348676904b1d2ce4ec90e9653117c9369f6dbf 100644 (file)
--- 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 cbeab340e80987afd7f15588c94676abe772a27b..8603da5b7f3ac53835bc5844b7b31a337c57dd60 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/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-03-14  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac (AC_CHECK_HEADERS): Delete.

diff --git a/sim/sh/Makefile.in b/sim/sh/Makefile.in
index b999e67a70e14bc7e4ae9d35eedb49722260b652..61422abf59a3c142f34653c05418b4c1933e2fcb 100644 (file)
--- 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 05d032994dbb6b585c723a5d7556bdb03f811916..43eee863c5ac8ea300ec52fc887d5b209146769c 100644 (file)
--- 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 0022d8e81a8e81e04bc2583d41d1e50ff3ff90bd..6c23ad9888094b0c851c7a3f4840ba8b2504675d 100644 (file)
--- 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 f02be2b7089a6bd0517e476f2bb771943d797bd0..8578b8a133e468d1323299c9146e429e6f30777b 100644 (file)
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+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 &

diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in
index 067158fbf458ec4d0b90c74fa96c26c476387ca3..c8ccde01b6fcd7e3212241e9fbbfdc9d026fcac4 100644 (file)
--- 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