From e787f858a43c9a6b54a74cec24f954b52619433e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 12 Apr 2015 05:47:39 -0400 Subject: 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. --- sim/arm/ChangeLog | 4 ++++ sim/arm/Makefile.in | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'sim/arm') diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 88d6c7a..802e837 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,7 @@ +2015-04-12 Mike Frysinger + + * Makefile.in (SIM_OBJS): Move wrapper.o to the start of the list. + 2015-04-06 Mike Frysinger * Makefile.in (SIM_OBJS): Delete sim-engine.o. diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in index 00c9bdf..5c37723 100644 --- 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 -- cgit v1.1