sim: arm/mips: fix sim_read/sim_write linkage errors

With sim-hrw.o being built & linked in the common list, some people are
getting linking errors now for these targets.  Move the main objects that
provide these functions before the common list to avoid that.
This commit is contained in:
Mike Frysinger
2015-04-12 05:47:39 -04:00
parent 29f1a5934a
commit e787f858a4
4 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2015-04-12 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Move wrapper.o to the start of the list.
2015-04-06 Mike Frysinger <vapier@gentoo.org> 2015-04-06 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete sim-engine.o. * Makefile.in (SIM_OBJS): Delete sim-engine.o.

View File

@ -20,11 +20,12 @@
SIM_EXTRA_CFLAGS = -DMODET SIM_EXTRA_CFLAGS = -DMODET
SIM_OBJS = \ SIM_OBJS = \
wrapper.o \
$(SIM_NEW_COMMON_OBJS) \ $(SIM_NEW_COMMON_OBJS) \
sim-cpu.o \ sim-cpu.o \
sim-hload.o \ sim-hload.o \
armemu26.o armemu32.o arminit.o armos.o armsupp.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 armcopro.o maverick.o iwmmxt.o
## COMMON_POST_CONFIG_FRAG ## COMMON_POST_CONFIG_FRAG

View File

@ -1,3 +1,7 @@
2015-04-12 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Move interp.o to the start of the list.
2015-04-06 Mike Frysinger <vapier@gentoo.org> 2015-04-06 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete sim-engine.o. * Makefile.in (SIM_OBJS): Delete sim-engine.o.

View File

@ -40,10 +40,10 @@ SIM_MULTI_OBJ = itable.o @sim_multi_obj@
MIPS_EXTRA_LIBS = @mips_extra_libs@ MIPS_EXTRA_LIBS = @mips_extra_libs@
SIM_OBJS = \ SIM_OBJS = \
interp.o \
$(SIM_@sim_gen@_OBJ) \ $(SIM_@sim_gen@_OBJ) \
$(SIM_NEW_COMMON_OBJS) \ $(SIM_NEW_COMMON_OBJS) \
cp1.o \ cp1.o \
interp.o \
mdmx.o \ mdmx.o \
dsp.o \ dsp.o \
sim-main.o \ sim-main.o \