Re: [PATCH] sim: move sim-engine.o/sim-hrw.o to the common list

[Mike Frysinger <vapier at gentoo dot org>]

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: signature.asc
Description: Digital signature