sim: move sim-engine.o/sim-hrw.o to the common list

This makes these two objects available to all sims by default.

46 files changed, 100 insertions, 35 deletions

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 1cd5df68105..88d6c7a5f58 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in (armos.o, armcopro.o, maverick.o, iwmmxt.o, arminit.o,
diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index aad18fb3f42..00c9bdf9509 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -22,7 +22,6 @@ SIM_EXTRA_CFLAGS = -DMODET
 SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
 	armemu26.o armemu32.o arminit.o armos.o armsupp.o \
 	armvirt.o bag.o thumbemu.o wrapper.o \
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 186cea32bd9..840ec0bc0cf 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* tconfig.h: Delete.
diff --git a/sim/avr/Makefile.in b/sim/avr/Makefile.in
index 880b1182883..d7b77d015c1 100644
--- a/sim/avr/Makefile.in
+++ b/sim/avr/Makefile.in
@@ -20,9 +20,7 @@ SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	interp.o \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-reason.o \
 	sim-resume.o \
 	sim-stop.o
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 216872674e9..74107293c84 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in (SIM_OBJS): Delete $(SIM_EXTRA_OBJS).
diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in
index 10178d13b66..38531a9e69a 100644
--- a/sim/bfin/Makefile.in
+++ b/sim/bfin/Makefile.in
@@ -28,9 +28,7 @@ SIM_OBJS = \
 	interp.o \
 	machs.o \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-model.o \
 	sim-reason.o \
 	sim-reg.o \
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 559545e57a7..bf7807c7c11 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Make-common.in (SIM_NEW_COMMON_OBJS): Add sim-engine.o and sim-hrw.o.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* run-sim.h, run.c: Delete.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 0b1f85a937f..50db255c2eb 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -177,8 +177,10 @@ SIM_NEW_COMMON_OBJS = \
 	sim-config.o \
 	sim-core.o \
 	sim-endian.o \
+	sim-engine.o \
 	sim-events.o \
 	sim-fpu.o \
+	sim-hrw.o \
 	sim-io.o \
 	sim-info.o \
 	sim-load.o \
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 55355c4d73f..6e2d58c2972 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_set_profile, sim_set_profile_size): Delete.
diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in
index 04aaca4dccf..3918cedbabd 100644
--- a/sim/cr16/Makefile.in
+++ b/sim/cr16/Makefile.in
@@ -20,7 +20,6 @@
 SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
 	interp.o \
 	table.o \
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 26e9752c3ec..0c56cb92808 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in
index 0b444011f11..5459c0e7a2e 100644
--- a/sim/cris/Makefile.in
+++ b/sim/cris/Makefile.in
@@ -25,11 +25,10 @@ CRISV32F_OBJS = crisv32f.o cpuv32.o decodev32.o modelv32.o mloopv32f.o
 SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
-	sim-hrw.o \
 	sim-model.o \
 	sim-reg.o \
 	cgen-utils.o cgen-trace.o cgen-scache.o \
-	cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
+	cgen-run.o sim-reason.o sim-stop.o \
 	sim-if.o arch.o \
 	$(CRISV10F_OBJS) \
 	$(CRISV32F_OBJS) \
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index e09a14f22f2..418f6cea022 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o.
+
 2015-04-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (lookup_hash): Change SIGILL to GDB_SIGNAL_ILL.
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index faa1286c04c..167e76bd8bf 100644
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -21,7 +21,6 @@ SIM_OBJS = \
 	interp.o \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
 	table.o \
 	simops.o \
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 2b5e74c2a0c..92e0dcb7220 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index 2c1503b166d..415d2abd424 100644
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -23,11 +23,10 @@ SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-model.o \
 	sim-reg.o \
 	cgen-utils.o cgen-trace.o cgen-scache.o cgen-fpu.o cgen-accfp.o \
-	cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
+	cgen-run.o sim-reason.o sim-stop.o \
 	sim-if.o arch.o \
 	$(FRV_OBJS) \
 	traps.o interrupts.o memory.o cache.o pipeline.o \
diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index d74e39071e6..ddf2bfa0c17 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in (SIM_OBJS): Delete $(SIM_EXTRA_OBJS).
diff --git a/sim/ft32/Makefile.in b/sim/ft32/Makefile.in
index e8c9bb55527..c124bf37164 100644
--- a/sim/ft32/Makefile.in
+++ b/sim/ft32/Makefile.in
@@ -26,7 +26,6 @@ SIM_OBJS = \
 	sim-core.o	\
 	sim-cpu.o	\
 	sim-endian.o	\
-	sim-engine.o	\
 	sim-events.o	\
 	sim-fpu.o	\
 	sim-hload.o	\
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 641f72d854b..c0be32df249 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in (SIM_OBJS): Delete $(SIM_EXTRA_OBJS).
diff --git a/sim/h8300/Makefile.in b/sim/h8300/Makefile.in
index 8893f80a402..9b89aea2abf 100644
--- a/sim/h8300/Makefile.in
+++ b/sim/h8300/Makefile.in
@@ -20,7 +20,6 @@
 SIM_OBJS = compile.o \
 	   $(SIM_NEW_COMMON_OBJS) \
 	   sim-cpu.o \
-	   sim-engine.o \
 	   sim-load.o
 
 ## COMMON_POST_CONFIG_FRAG
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 76d20c28e4e..bc95baf6651 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in
index 8068e60b337..3e07c53d4c2 100644
--- a/sim/iq2000/Makefile.in
+++ b/sim/iq2000/Makefile.in
@@ -23,11 +23,10 @@ SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-model.o \
 	sim-reg.o \
 	cgen-utils.o cgen-trace.o cgen-scache.o \
-	cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
+	cgen-run.o sim-reason.o sim-stop.o \
 	sim-if.o arch.o \
 	$(IQ2000_OBJS)
 
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index e777204feec..31e621f5f72 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in
index 60420a1d0ad..ea2dd2d9f1f 100644
--- a/sim/lm32/Makefile.in
+++ b/sim/lm32/Makefile.in
@@ -8,12 +8,11 @@ SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-model.o \
 	sim-reg.o \
 	sim-signal.o \
         cgen-utils.o cgen-trace.o cgen-scache.o \
-        cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
+        cgen-run.o sim-reason.o sim-stop.o \
         sim-if.o arch.o \
         cpu.o decode.o sem.o model.o mloop.o \
         lm32.o traps.o user.o 
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 5e0615dc635..e7d332fe5ea 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 491affd4c85..8f134f3009f 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -28,11 +28,10 @@ SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-model.o \
 	sim-reg.o \
 	cgen-utils.o cgen-trace.o cgen-scache.o \
-	cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
+	cgen-run.o sim-reason.o sim-stop.o \
 	sim-if.o arch.o \
 	$(M32R_OBJS) \
 	$(M32RX_OBJS) \
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index b06c3e3fca3..36190a29792 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* m68hc11_sim.c (cpu_get_indexed_operand_addr,
diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in
index a4a74c28e75..9b931a19958 100644
--- a/sim/m68hc11/Makefile.in
+++ b/sim/m68hc11/Makefile.in
@@ -24,9 +24,7 @@ SIM_OBJS = $(M68HC11_OBJS) \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-load.o \
 	sim-hload.o \
-	sim-engine.o \
 	sim-stop.o \
-	sim-hrw.o \
 	sim-reason.o
 
 SIM_PROFILE= -DPROFILE=1 -DWITH_PROFILE=-1
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 73279fb12f0..cd32d7ab7c2 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/mcore/Makefile.in b/sim/mcore/Makefile.in
index 82e6e685d16..a54c92ce9fb 100644
--- a/sim/mcore/Makefile.in
+++ b/sim/mcore/Makefile.in
@@ -21,7 +21,6 @@ SIM_OBJS = \
 	interp.o \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
 	sim-stop.o
 
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 166262c5651..5120267321c 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/microblaze/Makefile.in b/sim/microblaze/Makefile.in
index ca317662761..0085948dd9e 100644
--- a/sim/microblaze/Makefile.in
+++ b/sim/microblaze/Makefile.in
@@ -21,7 +21,6 @@ SIM_OBJS = \
 	interp.o \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
 	sim-reason.o \
 	sim-stop.o
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index a22a19eec6c..477c8c82987 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* tconfig.h (SIM_HAVE_PROFILE): Delete.
diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index b9151ebd427..2016db3b2fd 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -48,7 +48,6 @@ SIM_OBJS = \
 	dsp.o \
 	sim-main.o \
 	sim-hload.o \
-	sim-engine.o \
 	sim-stop.o \
 	sim-resume.o \
 	sim-reason.o \
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 838bdac3653..c4c12a21a76 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index cc04f9f75a9..a85d932ba75 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -21,9 +21,7 @@ MN10300_OBJS = \
 	itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \
 	$(SIM_NEW_COMMON_OBJS) \
 	op_utils.o \
-	sim-engine.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-resume.o \
 	sim-reason.o \
 	sim-stop.o
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 785c26e57c4..e59cbfafd1e 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-04-05  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in (SIM_OBJS): Add sim-resume.o.
diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index 963c46b3f3c..ff6bed9ff40 100644
--- a/sim/moxie/Makefile.in
+++ b/sim/moxie/Makefile.in
@@ -23,9 +23,7 @@ SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	interp.o \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-reason.o \
 	sim-resume.o \
 	sim-stop.o
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 29ff2f74da7..31e115c34b4 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in (SIM_OBJS): Delete $(SIM_EXTRA_OBJS).
diff --git a/sim/msp430/Makefile.in b/sim/msp430/Makefile.in
index a7f3dee586f..3ab384f3a8b 100644
--- a/sim/msp430/Makefile.in
+++ b/sim/msp430/Makefile.in
@@ -29,9 +29,7 @@ SIM_OBJS = \
 	msp430-sim.o \
 	trace.o \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-reason.o \
 	sim-reg.o \
 	sim-resume.o \
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 64c5741aac4..7b935241b9e 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/sh/Makefile.in b/sim/sh/Makefile.in
index ecfb287821f..19c15abb2ac 100644
--- a/sim/sh/Makefile.in
+++ b/sim/sh/Makefile.in
@@ -21,7 +21,6 @@ SIM_OBJS = \
 	interp.o \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
-	sim-engine.o \
 	sim-hload.o \
 	sim-stop.o \
 	table.o
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index b449969b6f0..e6a17e078d5 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/sh64/Makefile.in b/sim/sh64/Makefile.in
index 3df481c8d6f..19c9957a13e 100644
--- a/sim/sh64/Makefile.in
+++ b/sim/sh64/Makefile.in
@@ -25,11 +25,10 @@ SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	sim-cpu.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-model.o \
 	sim-reg.o \
 	cgen-utils.o cgen-trace.o cgen-scache.o \
-	cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
+	cgen-run.o sim-reason.o sim-stop.o \
 	sim-if.o arch.o \
 	$(SH64_OBJS)
 
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 22ed5b656f6..21518e0c53e 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-06  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (SIM_OBJS): Delete sim-engine.o and sim-hrw.o.
+
 2015-03-31  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in
index c8ccde01b6f..726ed5e06f2 100644
--- a/sim/v850/Makefile.in
+++ b/sim/v850/Makefile.in
@@ -23,9 +23,7 @@ SIM_OBJS = \
 	$(SIM_NEW_COMMON_OBJS) \
 	simops.o interp.o \
 	itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \
-	sim-engine.o \
 	sim-hload.o \
-	sim-hrw.o \
 	sim-resume.o \
 	sim-reason.o \
 	sim-stop.o