* [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list
@ 2015-04-07 3:57 Mike Frysinger
2015-04-08 11:09 ` Richard Earnshaw
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Mike Frysinger @ 2015-04-07 3:57 UTC (permalink / raw)
To: gdb-patches
This makes these two objects available to all sims by default.
Committed.
---
sim/arm/ChangeLog | 4 ++++
sim/arm/Makefile.in | 1 -
sim/avr/ChangeLog | 4 ++++
sim/avr/Makefile.in | 2 --
sim/bfin/ChangeLog | 4 ++++
sim/bfin/Makefile.in | 2 --
sim/common/ChangeLog | 4 ++++
sim/common/Make-common.in | 2 ++
sim/cr16/ChangeLog | 4 ++++
sim/cr16/Makefile.in | 1 -
sim/cris/ChangeLog | 4 ++++
sim/cris/Makefile.in | 3 +--
sim/d10v/ChangeLog | 4 ++++
sim/d10v/Makefile.in | 1 -
sim/frv/ChangeLog | 4 ++++
sim/frv/Makefile.in | 3 +--
sim/ft32/ChangeLog | 4 ++++
sim/ft32/Makefile.in | 1 -
sim/h8300/ChangeLog | 4 ++++
sim/h8300/Makefile.in | 1 -
sim/iq2000/ChangeLog | 4 ++++
sim/iq2000/Makefile.in | 3 +--
sim/lm32/ChangeLog | 4 ++++
sim/lm32/Makefile.in | 3 +--
sim/m32r/ChangeLog | 4 ++++
sim/m32r/Makefile.in | 3 +--
sim/m68hc11/ChangeLog | 4 ++++
sim/m68hc11/Makefile.in | 2 --
sim/mcore/ChangeLog | 4 ++++
sim/mcore/Makefile.in | 1 -
sim/microblaze/ChangeLog | 4 ++++
sim/microblaze/Makefile.in | 1 -
sim/mips/ChangeLog | 4 ++++
sim/mips/Makefile.in | 1 -
sim/mn10300/ChangeLog | 4 ++++
sim/mn10300/Makefile.in | 2 --
sim/moxie/ChangeLog | 4 ++++
sim/moxie/Makefile.in | 2 --
sim/msp430/ChangeLog | 4 ++++
sim/msp430/Makefile.in | 2 --
sim/sh/ChangeLog | 4 ++++
sim/sh/Makefile.in | 1 -
sim/sh64/ChangeLog | 4 ++++
sim/sh64/Makefile.in | 3 +--
sim/v850/ChangeLog | 4 ++++
sim/v850/Makefile.in | 2 --
46 files changed, 100 insertions(+), 35 deletions(-)
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 1cd5df6..88d6c7a 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 aad18fb..00c9bdf 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 186cea3..840ec0b 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 880b118..d7b77d0 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 2168726..7410729 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 10178d1..38531a9 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 559545e..bf7807c 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 0b1f85a..50db255 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 55355c4..6e2d58c 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 04aaca4..3918ced 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 26e9752..0c56cb9 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 0b44401..5459c0e 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 e09a14f..418f6ce 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 faa1286..167e76b 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 2b5e74c..92e0dcb 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 2c1503b..415d2ab 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 d74e390..ddf2bfa 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 e8c9bb5..c124bf3 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 641f72d..c0be32d 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 8893f80..9b89aea 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 76d20c2..bc95baf 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 8068e60..3e07c53 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 e777204..31e621f 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 60420a1..ea2dd2d 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 5e0615d..e7d332f 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 491affd..8f134f3 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 b06c3e3..36190a2 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 a4a74c2..9b931a1 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 73279fb..cd32d7a 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 82e6e68..a54c92c 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 166262c..5120267 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 ca31766..0085948 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 a22a19e..477c8c8 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 b9151eb..2016db3 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 838bdac..c4c12a2 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 cc04f9f..a85d932 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 785c26e..e59cbfa 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 963c46b..ff6bed9 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 29ff2f7..31e115c 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 a7f3dee..3ab384f 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 64c5741..7b93524 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 ecfb287..19c15ab 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 b449969..e6a17e0 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 3df481c..19c9957 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 22ed5b6..21518e0 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 c8ccde0..726ed5e 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
--
2.3.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list
2015-04-07 3:57 [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list Mike Frysinger
@ 2015-04-08 11:09 ` Richard Earnshaw
2015-04-08 15:46 ` Steve Ellcey
2015-04-12 9:54 ` Mike Frysinger
2015-04-09 6:42 ` Bin.Cheng
2015-04-10 9:05 ` Yao Qi
2 siblings, 2 replies; 7+ messages in thread
From: Richard Earnshaw @ 2015-04-08 11:09 UTC (permalink / raw)
To: Mike Frysinger, gdb-patches
On 07/04/15 04:57, Mike Frysinger wrote:
> This makes these two objects available to all sims by default.
>
Which breaks the build for the ARM simulator:
../sim/arm/libsim.a(wrapper.o): In function `sim_read'
:
/arm/scratch/rearnsha/gnusrc/gcc-cross/trunk/sim/arm/wrapper.c:195:
multiple definition of `sim_read'
../sim/arm/libsim.a(sim-hrw.o):/arm/scratch/rearnsha/gnusrc/gcc-cross/trunk/sim/arm/../common/sim-hrw.c:28:
first defined here
/usr/bin/ld: Warning: size of symbol `sim_read' changed from 119 in
../sim/arm/libsim.a(sim-hrw.o) to 76 in ../sim/arm/libsim.a(wrapper.o)
../sim/arm/libsim.a(wrapper.o): In function `sim_write':
/arm/scratch/rearnsha/gnusrc/gcc-cross/trunk/sim/arm/wrapper.c:179:
multiple definition of `sim_write'
../sim/arm/libsim.a(sim-hrw.o):/arm/scratch/rearnsha/gnusrc/gcc-cross/trunk/sim/arm/../common/sim-hrw.c:36:
first defined here
/usr/bin/ld: Warning: size of symbol `sim_write' changed from 122 in
../sim/arm/libsim.a(sim-hrw.o) to 77 in ../sim/arm/libsim.a(wrapper.o)
collect2: ld returned 1 exit status
R.
> Committed.
> ---
> sim/arm/ChangeLog | 4 ++++
> sim/arm/Makefile.in | 1 -
> sim/avr/ChangeLog | 4 ++++
> sim/avr/Makefile.in | 2 --
> sim/bfin/ChangeLog | 4 ++++
> sim/bfin/Makefile.in | 2 --
> sim/common/ChangeLog | 4 ++++
> sim/common/Make-common.in | 2 ++
> sim/cr16/ChangeLog | 4 ++++
> sim/cr16/Makefile.in | 1 -
> sim/cris/ChangeLog | 4 ++++
> sim/cris/Makefile.in | 3 +--
> sim/d10v/ChangeLog | 4 ++++
> sim/d10v/Makefile.in | 1 -
> sim/frv/ChangeLog | 4 ++++
> sim/frv/Makefile.in | 3 +--
> sim/ft32/ChangeLog | 4 ++++
> sim/ft32/Makefile.in | 1 -
> sim/h8300/ChangeLog | 4 ++++
> sim/h8300/Makefile.in | 1 -
> sim/iq2000/ChangeLog | 4 ++++
> sim/iq2000/Makefile.in | 3 +--
> sim/lm32/ChangeLog | 4 ++++
> sim/lm32/Makefile.in | 3 +--
> sim/m32r/ChangeLog | 4 ++++
> sim/m32r/Makefile.in | 3 +--
> sim/m68hc11/ChangeLog | 4 ++++
> sim/m68hc11/Makefile.in | 2 --
> sim/mcore/ChangeLog | 4 ++++
> sim/mcore/Makefile.in | 1 -
> sim/microblaze/ChangeLog | 4 ++++
> sim/microblaze/Makefile.in | 1 -
> sim/mips/ChangeLog | 4 ++++
> sim/mips/Makefile.in | 1 -
> sim/mn10300/ChangeLog | 4 ++++
> sim/mn10300/Makefile.in | 2 --
> sim/moxie/ChangeLog | 4 ++++
> sim/moxie/Makefile.in | 2 --
> sim/msp430/ChangeLog | 4 ++++
> sim/msp430/Makefile.in | 2 --
> sim/sh/ChangeLog | 4 ++++
> sim/sh/Makefile.in | 1 -
> sim/sh64/ChangeLog | 4 ++++
> sim/sh64/Makefile.in | 3 +--
> sim/v850/ChangeLog | 4 ++++
> sim/v850/Makefile.in | 2 --
> 46 files changed, 100 insertions(+), 35 deletions(-)
>
> diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
> index 1cd5df6..88d6c7a 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 aad18fb..00c9bdf 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 186cea3..840ec0b 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 880b118..d7b77d0 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 2168726..7410729 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 10178d1..38531a9 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 559545e..bf7807c 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 0b1f85a..50db255 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 55355c4..6e2d58c 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 04aaca4..3918ced 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 26e9752..0c56cb9 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 0b44401..5459c0e 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 e09a14f..418f6ce 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 faa1286..167e76b 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 2b5e74c..92e0dcb 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 2c1503b..415d2ab 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 d74e390..ddf2bfa 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 e8c9bb5..c124bf3 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 641f72d..c0be32d 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 8893f80..9b89aea 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 76d20c2..bc95baf 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 8068e60..3e07c53 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 e777204..31e621f 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 60420a1..ea2dd2d 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 5e0615d..e7d332f 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 491affd..8f134f3 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 b06c3e3..36190a2 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 a4a74c2..9b931a1 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 73279fb..cd32d7a 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 82e6e68..a54c92c 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 166262c..5120267 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 ca31766..0085948 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 a22a19e..477c8c8 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 b9151eb..2016db3 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 838bdac..c4c12a2 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 cc04f9f..a85d932 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 785c26e..e59cbfa 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 963c46b..ff6bed9 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 29ff2f7..31e115c 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 a7f3dee..3ab384f 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 64c5741..7b93524 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 ecfb287..19c15ab 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 b449969..e6a17e0 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 3df481c..19c9957 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 22ed5b6..21518e0 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 c8ccde0..726ed5e 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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list
2015-04-08 11:09 ` Richard Earnshaw
@ 2015-04-08 15:46 ` Steve Ellcey
2015-04-12 9:54 ` Mike Frysinger
1 sibling, 0 replies; 7+ messages in thread
From: Steve Ellcey @ 2015-04-08 15:46 UTC (permalink / raw)
To: Richard Earnshaw; +Cc: Mike Frysinger, gdb-patches
On Wed, 2015-04-08 at 12:09 +0100, Richard Earnshaw wrote:
> On 07/04/15 04:57, Mike Frysinger wrote:
> > This makes these two objects available to all sims by default.
> >
>
> Which breaks the build for the ARM simulator:
>
> ../sim/arm/libsim.a(wrapper.o): In function `sim_read'
> :
> /arm/scratch/rearnsha/gnusrc/gcc-cross/trunk/sim/arm/wrapper.c:195:
> multiple definition of `sim_read'
> ../sim/arm/libsim.a(sim-hrw.o):/arm/scratch/rearnsha/gnusrc/gcc-cross/trunk/sim/arm/../common/sim-hrw.c:28:
> first defined here
> /usr/bin/ld: Warning: size of symbol `sim_read' changed from 119 in
> ../sim/arm/libsim.a(sim-hrw.o) to 76 in ../sim/arm/libsim.a(wrapper.o)
> ../sim/arm/libsim.a(wrapper.o): In function `sim_write':
> /arm/scratch/rearnsha/gnusrc/gcc-cross/trunk/sim/arm/wrapper.c:179:
> multiple definition of `sim_write'
> ../sim/arm/libsim.a(sim-hrw.o):/arm/scratch/rearnsha/gnusrc/gcc-cross/trunk/sim/arm/../common/sim-hrw.c:36:
> first defined here
> /usr/bin/ld: Warning: size of symbol `sim_write' changed from 122 in
> ../sim/arm/libsim.a(sim-hrw.o) to 77 in ../sim/arm/libsim.a(wrapper.o)
> collect2: ld returned 1 exit status
>
> R.
I am seeing this failure on MIPS as well.
Steve Ellcey
sellcey@imgtec.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list
2015-04-07 3:57 [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list Mike Frysinger
2015-04-08 11:09 ` Richard Earnshaw
@ 2015-04-09 6:42 ` Bin.Cheng
2015-04-10 9:05 ` Yao Qi
2 siblings, 0 replies; 7+ messages in thread
From: Bin.Cheng @ 2015-04-09 6:42 UTC (permalink / raw)
To: Mike Frysinger; +Cc: gdb-patches
On Tue, Apr 7, 2015 at 11:57 AM, Mike Frysinger <vapier@gentoo.org> wrote:
> This makes these two objects available to all sims by default.
Some targets define their own version sim_read/sim_write in different
target dependent files, simply adding sim-hrw in common makefile would
break those targets. Seems reasonable to revert sim-hrw part of this
patch?
Thanks,
bin
>
> Committed.
> ---
> sim/arm/ChangeLog | 4 ++++
> sim/arm/Makefile.in | 1 -
> sim/avr/ChangeLog | 4 ++++
> sim/avr/Makefile.in | 2 --
> sim/bfin/ChangeLog | 4 ++++
> sim/bfin/Makefile.in | 2 --
> sim/common/ChangeLog | 4 ++++
> sim/common/Make-common.in | 2 ++
> sim/cr16/ChangeLog | 4 ++++
> sim/cr16/Makefile.in | 1 -
> sim/cris/ChangeLog | 4 ++++
> sim/cris/Makefile.in | 3 +--
> sim/d10v/ChangeLog | 4 ++++
> sim/d10v/Makefile.in | 1 -
> sim/frv/ChangeLog | 4 ++++
> sim/frv/Makefile.in | 3 +--
> sim/ft32/ChangeLog | 4 ++++
> sim/ft32/Makefile.in | 1 -
> sim/h8300/ChangeLog | 4 ++++
> sim/h8300/Makefile.in | 1 -
> sim/iq2000/ChangeLog | 4 ++++
> sim/iq2000/Makefile.in | 3 +--
> sim/lm32/ChangeLog | 4 ++++
> sim/lm32/Makefile.in | 3 +--
> sim/m32r/ChangeLog | 4 ++++
> sim/m32r/Makefile.in | 3 +--
> sim/m68hc11/ChangeLog | 4 ++++
> sim/m68hc11/Makefile.in | 2 --
> sim/mcore/ChangeLog | 4 ++++
> sim/mcore/Makefile.in | 1 -
> sim/microblaze/ChangeLog | 4 ++++
> sim/microblaze/Makefile.in | 1 -
> sim/mips/ChangeLog | 4 ++++
> sim/mips/Makefile.in | 1 -
> sim/mn10300/ChangeLog | 4 ++++
> sim/mn10300/Makefile.in | 2 --
> sim/moxie/ChangeLog | 4 ++++
> sim/moxie/Makefile.in | 2 --
> sim/msp430/ChangeLog | 4 ++++
> sim/msp430/Makefile.in | 2 --
> sim/sh/ChangeLog | 4 ++++
> sim/sh/Makefile.in | 1 -
> sim/sh64/ChangeLog | 4 ++++
> sim/sh64/Makefile.in | 3 +--
> sim/v850/ChangeLog | 4 ++++
> sim/v850/Makefile.in | 2 --
> 46 files changed, 100 insertions(+), 35 deletions(-)
>
> diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
> index 1cd5df6..88d6c7a 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 aad18fb..00c9bdf 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 186cea3..840ec0b 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 880b118..d7b77d0 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 2168726..7410729 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 10178d1..38531a9 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 559545e..bf7807c 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 0b1f85a..50db255 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 55355c4..6e2d58c 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 04aaca4..3918ced 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 26e9752..0c56cb9 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 0b44401..5459c0e 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 e09a14f..418f6ce 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 faa1286..167e76b 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 2b5e74c..92e0dcb 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 2c1503b..415d2ab 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 d74e390..ddf2bfa 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 e8c9bb5..c124bf3 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 641f72d..c0be32d 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 8893f80..9b89aea 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 76d20c2..bc95baf 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 8068e60..3e07c53 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 e777204..31e621f 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 60420a1..ea2dd2d 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 5e0615d..e7d332f 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 491affd..8f134f3 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 b06c3e3..36190a2 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 a4a74c2..9b931a1 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 73279fb..cd32d7a 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 82e6e68..a54c92c 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 166262c..5120267 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 ca31766..0085948 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 a22a19e..477c8c8 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 b9151eb..2016db3 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 838bdac..c4c12a2 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 cc04f9f..a85d932 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 785c26e..e59cbfa 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 963c46b..ff6bed9 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 29ff2f7..31e115c 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 a7f3dee..3ab384f 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 64c5741..7b93524 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 ecfb287..19c15ab 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 b449969..e6a17e0 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 3df481c..19c9957 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 22ed5b6..21518e0 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 c8ccde0..726ed5e 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
> --
> 2.3.5
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list
2015-04-07 3:57 [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list Mike Frysinger
2015-04-08 11:09 ` Richard Earnshaw
2015-04-09 6:42 ` Bin.Cheng
@ 2015-04-10 9:05 ` Yao Qi
2015-04-12 9:55 ` Mike Frysinger
2 siblings, 1 reply; 7+ messages in thread
From: Yao Qi @ 2015-04-10 9:05 UTC (permalink / raw)
To: Mike Frysinger; +Cc: gdb-patches
Mike Frysinger <vapier@gentoo.org> writes:
> This makes these two objects available to all sims by default.
Hi Mike,
How about the patch below which unbreaks the sim build for
arm-none-eabi and mips-elf target?
--
Yao (齐尧)
From: Yao Qi <yao.qi@linaro.org>
Date: Fri, 10 Apr 2015 09:59:16 +0100
Subject: [PATCH] Move sim-hrw.o out of SIM_NEW_COMMON_OBJS
This patch breaks the sim build for some targets, such as arm-none-eabi
and mips-elf.
[PATCH] sim: move sim-engine.o/sim-hrw.o to the common list
https://sourceware.org/ml/gdb-patches/2015-04/msg00178.html
Looks sim-engine.o is common to all targets, but sim-hrw.o isn't. This
patch is to move sim-hrw.o out of SIM_NEW_COMMON_OBJS, and put it back
to each target which needs it.
Is this patch OK? I'll complete the changelog entries once the patch
is approved.
diff --git a/sim/avr/Makefile.in b/sim/avr/Makefile.in
index d7b77d0..1fcce22 100644
--- a/sim/avr/Makefile.in
+++ b/sim/avr/Makefile.in
@@ -21,6 +21,7 @@ SIM_OBJS = \
interp.o \
sim-cpu.o \
sim-hload.o \
+ sim-hrw.o \
sim-reason.o \
sim-resume.o \
sim-stop.o
diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in
index 38531a9..8dfb731 100644
--- a/sim/bfin/Makefile.in
+++ b/sim/bfin/Makefile.in
@@ -29,6 +29,7 @@ SIM_OBJS = \
machs.o \
sim-cpu.o \
sim-hload.o \
+ sim-hrw.o \
sim-model.o \
sim-reason.o \
sim-reg.o \
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 50db255..f2bff38 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -180,7 +180,6 @@ SIM_NEW_COMMON_OBJS = \
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/cris/Makefile.in b/sim/cris/Makefile.in
index 5459c0e..fe0191a 100644
--- a/sim/cris/Makefile.in
+++ b/sim/cris/Makefile.in
@@ -25,6 +25,7 @@ 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 \
diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index 415d2ab..b5b3512 100644
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -23,6 +23,7 @@ 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 \
diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in
index 3e07c53..8ed0e6c 100644
--- a/sim/iq2000/Makefile.in
+++ b/sim/iq2000/Makefile.in
@@ -23,6 +23,7 @@ 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 \
diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in
index ea2dd2d..ef87bea 100644
--- a/sim/lm32/Makefile.in
+++ b/sim/lm32/Makefile.in
@@ -8,6 +8,7 @@ SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
sim-cpu.o \
sim-hload.o \
+ sim-hrw.o \
sim-model.o \
sim-reg.o \
sim-signal.o \
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 8f134f3..e1c2d88 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -28,6 +28,7 @@ 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 \
diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in
index 9b931a1..ea52d9b 100644
--- a/sim/m68hc11/Makefile.in
+++ b/sim/m68hc11/Makefile.in
@@ -25,6 +25,7 @@ SIM_OBJS = $(M68HC11_OBJS) \
sim-load.o \
sim-hload.o \
sim-stop.o \
+ sim-hrw.o \
sim-reason.o
SIM_PROFILE= -DPROFILE=1 -DWITH_PROFILE=-1
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index a85d932..275d378 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -22,6 +22,7 @@ MN10300_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
op_utils.o \
sim-hload.o \
+ sim-hrw.o \
sim-resume.o \
sim-reason.o \
sim-stop.o
diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index ff6bed9..ec83601 100644
--- a/sim/moxie/Makefile.in
+++ b/sim/moxie/Makefile.in
@@ -24,6 +24,7 @@ SIM_OBJS = \
interp.o \
sim-cpu.o \
sim-hload.o \
+ sim-hrw.o \
sim-reason.o \
sim-resume.o \
sim-stop.o
diff --git a/sim/msp430/Makefile.in b/sim/msp430/Makefile.in
index 3ab384f..3076312 100644
--- a/sim/msp430/Makefile.in
+++ b/sim/msp430/Makefile.in
@@ -30,6 +30,7 @@ SIM_OBJS = \
trace.o \
sim-cpu.o \
sim-hload.o \
+ sim-hrw.o \
sim-reason.o \
sim-reg.o \
sim-resume.o \
diff --git a/sim/sh64/Makefile.in b/sim/sh64/Makefile.in
index 19c9957..5747343 100644
--- a/sim/sh64/Makefile.in
+++ b/sim/sh64/Makefile.in
@@ -25,6 +25,7 @@ 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 \
diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in
index 726ed5e..af9cf47 100644
--- a/sim/v850/Makefile.in
+++ b/sim/v850/Makefile.in
@@ -24,6 +24,7 @@ SIM_OBJS = \
simops.o interp.o \
itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \
sim-hload.o \
+ sim-hrw.o \
sim-resume.o \
sim-reason.o \
sim-stop.o
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list
2015-04-08 11:09 ` Richard Earnshaw
2015-04-08 15:46 ` Steve Ellcey
@ 2015-04-12 9:54 ` Mike Frysinger
1 sibling, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2015-04-12 9:54 UTC (permalink / raw)
To: Richard Earnshaw, sellcey; +Cc: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]
On 08 Apr 2015 12:09, Richard Earnshaw wrote:
> On 07/04/15 04:57, Mike Frysinger wrote:
> > This makes these two objects available to all sims by default.
>
> Which breaks the build for the ARM simulator:
odd, it's building & passing tests for me. i usually check every sim target
before committing.
at any rate, it's clearly not working for you, so i'll try to fix it for
arm/mips thusly.
-mike
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -20,11 +20,12 @@
SIM_EXTRA_CFLAGS = -DMODET
SIM_OBJS = \
+ wrapper.o \
$(SIM_NEW_COMMON_OBJS) \
sim-cpu.o \
sim-hload.o \
armemu26.o armemu32.o arminit.o armos.o armsupp.o \
- armvirt.o bag.o thumbemu.o wrapper.o \
+ armvirt.o bag.o thumbemu.o \
armcopro.o maverick.o iwmmxt.o
## COMMON_POST_CONFIG_FRAG
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -40,10 +40,10 @@ SIM_MULTI_OBJ = itable.o @sim_multi_obj@
MIPS_EXTRA_LIBS = @mips_extra_libs@
SIM_OBJS = \
+ interp.o \
$(SIM_@sim_gen@_OBJ) \
$(SIM_NEW_COMMON_OBJS) \
cp1.o \
- interp.o \
mdmx.o \
dsp.o \
sim-main.o \
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list
2015-04-10 9:05 ` Yao Qi
@ 2015-04-12 9:55 ` Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2015-04-12 9:55 UTC (permalink / raw)
To: Yao Qi; +Cc: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
On 10 Apr 2015 10:04, Yao Qi wrote:
> This patch breaks the sim build for some targets, such as arm-none-eabi
> and mips-elf.
>
> [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list
> https://sourceware.org/ml/gdb-patches/2015-04/msg00178.html
>
> Looks sim-engine.o is common to all targets, but sim-hrw.o isn't. This
> patch is to move sim-hrw.o out of SIM_NEW_COMMON_OBJS, and put it back
> to each target which needs it.
the intention is to build all of common/ all the time and discourage targets
from writing their own sim_xxx funcs. even if that means the object doesn't
get used. i've landed a different change in the tree now which should fix
arm & mips.
-mike
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-04-12 9:55 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-07 3:57 [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list Mike Frysinger
2015-04-08 11:09 ` Richard Earnshaw
2015-04-08 15:46 ` Steve Ellcey
2015-04-12 9:54 ` Mike Frysinger
2015-04-09 6:42 ` Bin.Cheng
2015-04-10 9:05 ` Yao Qi
2015-04-12 9:55 ` Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox