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

This makes these two objects available to all sims by default.
2024-11-27 03:51:15 +08:00 · 2015-04-06 23:40:00 -04:00 · 2015-04-06 23:40:00 -04:00 · 122bbfb52a
commit 122bbfb52a
parent dc081549e7
46 changed files with 100 additions and 35 deletions
--- 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,
--- 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 \
--- 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.
--- 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
--- 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).
--- 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 \
--- 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.
--- 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 \
--- 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.
--- 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 \
--- 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.
--- 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) \
--- 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.
--- 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 \
--- 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.
--- 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 \
--- 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).
--- 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	\
--- 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).
--- 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
--- 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.
--- 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)

--- 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.
--- 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 
--- 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.
--- 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) \
--- 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,
--- 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
--- 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.
--- 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

--- 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.
--- 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
--- 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.
--- 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 \
--- 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.
--- 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
--- 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.
--- 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
--- 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).
--- 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 \
--- 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.
--- 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
--- 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.
--- 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)

--- 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.
--- 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