btrace: honour scheduler-locking for all-stop targets

[deliverable/binutils-gdb.git] / sim / mips / Makefile.in

diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index cac7a293a202b715bb491814b7007944153c2241..17eeab6ae0e3933208b6561428da37c30f1c8821 100644 (file)
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -37,20 +37,17 @@ SIM_M16_OBJ = \
 
 SIM_MULTI_OBJ = itable.o @sim_multi_obj@
 
-MIPS_EXTRA_OBJS = @mips_extra_objs@
 MIPS_EXTRA_LIBS = @mips_extra_libs@
 
 SIM_OBJS = \
+       interp.o \
        $(SIM_@sim_gen@_OBJ) \
        $(SIM_NEW_COMMON_OBJS) \
-       $(MIPS_EXTRA_OBJS) \
        cp1.o \
-       interp.o \
        mdmx.o \
        dsp.o \
        sim-main.o \
        sim-hload.o \
-       sim-engine.o \
        sim-stop.o \
        sim-resume.o \
        sim-reason.o \
@@ -67,10 +64,6 @@ SIM_EXTRA_ALL = $(SIM_@sim_gen@_ALL)
 
 SIM_EXTRA_LIBS = $(MIPS_EXTRA_LIBS)
 
-# List of main object files for `run'.
-SIM_RUN_OBJS = nrun.o
-
-
 
 ## COMMON_POST_CONFIG_FRAG
 
@@ -186,6 +179,7 @@ engine.o: sim-main.h engine.c $(SIM_EXTRA_DEPS)
 support.o: sim-main.h support.c $(SIM_EXTRA_DEPS)
 idecode.o: sim-main.h idecode.c $(SIM_EXTRA_DEPS)
 itable.o: sim-main.h itable.c $(SIM_EXTRA_DEPS)
+m16run.o: sim-main.h m16_idecode.h m32_idecode.h $(SIM_EXTRA_DEPS)
 
 m16_semantics.o: sim-main.h m16_semantics.c $(SIM_EXTRA_DEPS)
 m16_support.o: sim-main.h m16_support.c $(SIM_EXTRA_DEPS)
@@ -197,6 +191,8 @@ m32_support.o: sim-main.h m32_support.c $(SIM_EXTRA_DEPS)
 m32_idecode.o: sim-main.h m32_idecode.c $(SIM_EXTRA_DEPS)
 m32_icache.o: sim-main.h m32_icache.c $(SIM_EXTRA_DEPS)
 
+$(SIM_MULTI_OBJ): sim-main.h $(SIM_EXTRA_DEPS)
+
 BUILT_SRC_FROM_M16 = \
        m16_icache.h \
        m16_icache.c \
@@ -351,7 +347,7 @@ tmp-mach-multi: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
                -n $${p}_support.c   -f  tmp-support.c \
                -n $${p}_engine.h    -he tmp-engine.h \
                -n $${p}_engine.c    -e  tmp-engine.c \
-               ; \
+         || exit; \
          $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h $${p}_icache.h ; \
          $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c $${p}_icache.c ; \
          $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h $${p}_idecode.h ; \