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.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 88d6c7a5f58c3c85f5ea0c5e69c543bb5e0bb505..802e837bff71a63eebc43a4616ea91e0a931b3e4 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -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>
 
        * Makefile.in (SIM_OBJS): Delete sim-engine.o.

diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index 00c9bdf9509d0a985650549354c20e9d7bf38dc6..5c3772308dc4df877b67bf227c3b4592140f7e76 100644 (file)
--- 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

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 477c8c829878a148b0f9992d682bc11b5a8f51b1..d6a29c1868694026f68e455a20f19f81c3f1fd9f 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -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>
 
        * Makefile.in (SIM_OBJS): Delete sim-engine.o.

diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 2016db3b2fde0e1488caa688904f41723e6f4749..17eeab6ae0e3933208b6561428da37c30f1c8821 100644 (file)
--- 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 \