sim: cris: move libsim.a creation to top-level

The objects are still compiled in the subdir, but the creation of the
archive itself is in the top-level.  This is a required step before we
can move compilation itself up, and makes it easier to review.

The downside is that each object compile is a recursive make instead of
a single one.  On my 4 core system, it adds ~100msec to the build per
port, so it's not great, but it shouldn't be a big deal.  This will go
away of course once the top-level compiles objects.

3 files changed, 205 insertions, 115 deletions

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 8d12022..e12fe8f 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -164,88 +164,89 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \
 @SIM_ENABLE_ARCH_cr16_TRUE@am__append_25 = $(cr16_BUILD_OUTPUTS)
 @SIM_ENABLE_ARCH_cr16_TRUE@am__append_26 = cr16/gencode
 @SIM_ENABLE_ARCH_cr16_TRUE@am__append_27 = $(cr16_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_cris_TRUE@am__append_28 = cris/run
-@SIM_ENABLE_ARCH_cris_TRUE@am__append_29 = cris_SIM_EXTRA_HW_DEVICES="$(cris_SIM_EXTRA_HW_DEVICES)"
-@SIM_ENABLE_ARCH_cris_TRUE@am__append_30 = cris/rvdummy
-@SIM_ENABLE_ARCH_cris_TRUE@am__append_31 = \
+@SIM_ENABLE_ARCH_cris_TRUE@am__append_28 = cris/libsim.a
+@SIM_ENABLE_ARCH_cris_TRUE@am__append_29 = cris/run
+@SIM_ENABLE_ARCH_cris_TRUE@am__append_30 = cris_SIM_EXTRA_HW_DEVICES="$(cris_SIM_EXTRA_HW_DEVICES)"
+@SIM_ENABLE_ARCH_cris_TRUE@am__append_31 = cris/rvdummy
+@SIM_ENABLE_ARCH_cris_TRUE@am__append_32 = \
 @SIM_ENABLE_ARCH_cris_TRUE@	cris/engv10.h \
 @SIM_ENABLE_ARCH_cris_TRUE@	cris/engv32.h
 
-@SIM_ENABLE_ARCH_cris_TRUE@am__append_32 = $(cris_BUILD_OUTPUTS)
 @SIM_ENABLE_ARCH_cris_TRUE@am__append_33 = $(cris_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_d10v_TRUE@am__append_34 = d10v/run
-@SIM_ENABLE_ARCH_d10v_TRUE@am__append_35 = d10v/simops.h
-@SIM_ENABLE_ARCH_d10v_TRUE@am__append_36 = $(d10v_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_d10v_TRUE@am__append_37 = d10v/gencode
-@SIM_ENABLE_ARCH_d10v_TRUE@am__append_38 = $(d10v_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_erc32_TRUE@am__append_39 = erc32/run erc32/sis
-@SIM_ENABLE_ARCH_erc32_TRUE@am__append_40 = sim-%D-install-exec-local
-@SIM_ENABLE_ARCH_erc32_TRUE@am__append_41 = sim-erc32-uninstall-local
-@SIM_ENABLE_ARCH_examples_TRUE@am__append_42 = example-synacor/run
-@SIM_ENABLE_ARCH_frv_TRUE@am__append_43 = frv/run
-@SIM_ENABLE_ARCH_frv_TRUE@am__append_44 = frv/eng.h
-@SIM_ENABLE_ARCH_frv_TRUE@am__append_45 = $(frv_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_cris_TRUE@am__append_34 = $(cris_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_d10v_TRUE@am__append_35 = d10v/run
+@SIM_ENABLE_ARCH_d10v_TRUE@am__append_36 = d10v/simops.h
+@SIM_ENABLE_ARCH_d10v_TRUE@am__append_37 = $(d10v_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_d10v_TRUE@am__append_38 = d10v/gencode
+@SIM_ENABLE_ARCH_d10v_TRUE@am__append_39 = $(d10v_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_erc32_TRUE@am__append_40 = erc32/run erc32/sis
+@SIM_ENABLE_ARCH_erc32_TRUE@am__append_41 = sim-%D-install-exec-local
+@SIM_ENABLE_ARCH_erc32_TRUE@am__append_42 = sim-erc32-uninstall-local
+@SIM_ENABLE_ARCH_examples_TRUE@am__append_43 = example-synacor/run
+@SIM_ENABLE_ARCH_frv_TRUE@am__append_44 = frv/run
+@SIM_ENABLE_ARCH_frv_TRUE@am__append_45 = frv/eng.h
 @SIM_ENABLE_ARCH_frv_TRUE@am__append_46 = $(frv_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_ft32_TRUE@am__append_47 = ft32/run
-@SIM_ENABLE_ARCH_h8300_TRUE@am__append_48 = h8300/run
-@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_49 = iq2000/run
-@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_50 = iq2000/eng.h
-@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_51 = $(iq2000_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_frv_TRUE@am__append_47 = $(frv_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_ft32_TRUE@am__append_48 = ft32/run
+@SIM_ENABLE_ARCH_h8300_TRUE@am__append_49 = h8300/run
+@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_50 = iq2000/run
+@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_51 = iq2000/eng.h
 @SIM_ENABLE_ARCH_iq2000_TRUE@am__append_52 = $(iq2000_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_lm32_TRUE@am__append_53 = lm32/run
-@SIM_ENABLE_ARCH_lm32_TRUE@am__append_54 = lm32_SIM_EXTRA_HW_DEVICES="$(lm32_SIM_EXTRA_HW_DEVICES)"
-@SIM_ENABLE_ARCH_lm32_TRUE@am__append_55 = lm32/eng.h
-@SIM_ENABLE_ARCH_lm32_TRUE@am__append_56 = $(lm32_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_53 = $(iq2000_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_lm32_TRUE@am__append_54 = lm32/run
+@SIM_ENABLE_ARCH_lm32_TRUE@am__append_55 = lm32_SIM_EXTRA_HW_DEVICES="$(lm32_SIM_EXTRA_HW_DEVICES)"
+@SIM_ENABLE_ARCH_lm32_TRUE@am__append_56 = lm32/eng.h
 @SIM_ENABLE_ARCH_lm32_TRUE@am__append_57 = $(lm32_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_m32c_TRUE@am__append_58 = m32c/run
-@SIM_ENABLE_ARCH_m32c_TRUE@am__append_59 = $(m32c_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_m32c_TRUE@am__append_60 = m32c/opc2c
-@SIM_ENABLE_ARCH_m32c_TRUE@am__append_61 = \
+@SIM_ENABLE_ARCH_lm32_TRUE@am__append_58 = $(lm32_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_m32c_TRUE@am__append_59 = m32c/run
+@SIM_ENABLE_ARCH_m32c_TRUE@am__append_60 = $(m32c_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_m32c_TRUE@am__append_61 = m32c/opc2c
+@SIM_ENABLE_ARCH_m32c_TRUE@am__append_62 = \
 @SIM_ENABLE_ARCH_m32c_TRUE@	$(m32c_BUILD_OUTPUTS) \
 @SIM_ENABLE_ARCH_m32c_TRUE@	m32c/m32c.c.log \
 @SIM_ENABLE_ARCH_m32c_TRUE@	m32c/r8c.c.log
 
-@SIM_ENABLE_ARCH_m32r_TRUE@am__append_62 = m32r/run
-@SIM_ENABLE_ARCH_m32r_TRUE@am__append_63 = m32r_SIM_EXTRA_HW_DEVICES="$(m32r_SIM_EXTRA_HW_DEVICES)"
-@SIM_ENABLE_ARCH_m32r_TRUE@am__append_64 = \
+@SIM_ENABLE_ARCH_m32r_TRUE@am__append_63 = m32r/run
+@SIM_ENABLE_ARCH_m32r_TRUE@am__append_64 = m32r_SIM_EXTRA_HW_DEVICES="$(m32r_SIM_EXTRA_HW_DEVICES)"
+@SIM_ENABLE_ARCH_m32r_TRUE@am__append_65 = \
 @SIM_ENABLE_ARCH_m32r_TRUE@	m32r/eng.h \
 @SIM_ENABLE_ARCH_m32r_TRUE@	m32r/engx.h \
 @SIM_ENABLE_ARCH_m32r_TRUE@	m32r/eng2.h
 
-@SIM_ENABLE_ARCH_m32r_TRUE@am__append_65 = $(m32r_BUILD_OUTPUTS)
 @SIM_ENABLE_ARCH_m32r_TRUE@am__append_66 = $(m32r_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_67 = m68hc11/run
-@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_68 = m68hc11_SIM_EXTRA_HW_DEVICES="$(m68hc11_SIM_EXTRA_HW_DEVICES)"
-@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_69 = $(m68hc11_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_70 = m68hc11/gencode
-@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_71 = $(m68hc11_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_mcore_TRUE@am__append_72 = mcore/run
-@SIM_ENABLE_ARCH_microblaze_TRUE@am__append_73 = microblaze/run
-@SIM_ENABLE_ARCH_mips_TRUE@am__append_74 = mips/run
-@SIM_ENABLE_ARCH_mips_TRUE@am__append_75 = mips_SIM_EXTRA_HW_DEVICES="$(mips_SIM_EXTRA_HW_DEVICES)"
-@SIM_ENABLE_ARCH_mips_TRUE@am__append_76 = mips/itable.h \
+@SIM_ENABLE_ARCH_m32r_TRUE@am__append_67 = $(m32r_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_68 = m68hc11/run
+@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_69 = m68hc11_SIM_EXTRA_HW_DEVICES="$(m68hc11_SIM_EXTRA_HW_DEVICES)"
+@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_70 = $(m68hc11_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_71 = m68hc11/gencode
+@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_72 = $(m68hc11_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_mcore_TRUE@am__append_73 = mcore/run
+@SIM_ENABLE_ARCH_microblaze_TRUE@am__append_74 = microblaze/run
+@SIM_ENABLE_ARCH_mips_TRUE@am__append_75 = mips/run
+@SIM_ENABLE_ARCH_mips_TRUE@am__append_76 = mips_SIM_EXTRA_HW_DEVICES="$(mips_SIM_EXTRA_HW_DEVICES)"
+@SIM_ENABLE_ARCH_mips_TRUE@am__append_77 = mips/itable.h \
 @SIM_ENABLE_ARCH_mips_TRUE@	$(SIM_MIPS_MULTI_SRC)
-@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@am__append_77 = \
+@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@am__append_78 = \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@	$(mips_BUILT_SRC_FROM_GEN_MODE_SINGLE) \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@	mips/stamp-gen-mode-single
 
-@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@am__append_78 = \
+@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@am__append_79 = \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@	$(mips_BUILT_SRC_FROM_GEN_MODE_M16_M16) \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@	$(mips_BUILT_SRC_FROM_GEN_MODE_M16_M32) \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@	mips/stamp-gen-mode-m16-m16 \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@	mips/stamp-gen-mode-m16-m32
 
-@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@am__append_79 = \
+@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@am__append_80 = \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@	$(SIM_MIPS_MULTI_SRC) \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@	mips/stamp-gen-mode-multi-igen \
 @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@	mips/stamp-gen-mode-multi-run
 
-@SIM_ENABLE_ARCH_mips_TRUE@am__append_80 = $(mips_BUILD_OUTPUTS)
 @SIM_ENABLE_ARCH_mips_TRUE@am__append_81 = $(mips_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_mips_TRUE@am__append_82 = mips/multi-include.h mips/multi-run.c
-@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_83 = mn10300/run
-@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_84 = mn10300_SIM_EXTRA_HW_DEVICES="$(mn10300_SIM_EXTRA_HW_DEVICES)"
-@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_85 = \
+@SIM_ENABLE_ARCH_mips_TRUE@am__append_82 = $(mips_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_mips_TRUE@am__append_83 = mips/multi-include.h mips/multi-run.c
+@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_84 = mn10300/run
+@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_85 = mn10300_SIM_EXTRA_HW_DEVICES="$(mn10300_SIM_EXTRA_HW_DEVICES)"
+@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_86 = \
 @SIM_ENABLE_ARCH_mn10300_TRUE@	mn10300/icache.h \
 @SIM_ENABLE_ARCH_mn10300_TRUE@	mn10300/idecode.h \
 @SIM_ENABLE_ARCH_mn10300_TRUE@	mn10300/semantics.h \
@@ -254,29 +255,29 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \
 @SIM_ENABLE_ARCH_mn10300_TRUE@	mn10300/itable.h \
 @SIM_ENABLE_ARCH_mn10300_TRUE@	mn10300/engine.h
 
-@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_86 = $(mn10300_BUILD_OUTPUTS)
 @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_87 = $(mn10300_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_moxie_TRUE@am__append_88 = moxie/run
-@SIM_ENABLE_ARCH_msp430_TRUE@am__append_89 = msp430/run
-@SIM_ENABLE_ARCH_or1k_TRUE@am__append_90 = or1k/run
-@SIM_ENABLE_ARCH_or1k_TRUE@am__append_91 = or1k/eng.h
-@SIM_ENABLE_ARCH_or1k_TRUE@am__append_92 = $(or1k_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_88 = $(mn10300_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_moxie_TRUE@am__append_89 = moxie/run
+@SIM_ENABLE_ARCH_msp430_TRUE@am__append_90 = msp430/run
+@SIM_ENABLE_ARCH_or1k_TRUE@am__append_91 = or1k/run
+@SIM_ENABLE_ARCH_or1k_TRUE@am__append_92 = or1k/eng.h
 @SIM_ENABLE_ARCH_or1k_TRUE@am__append_93 = $(or1k_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_ppc_TRUE@am__append_94 = ppc/run ppc/psim
-@SIM_ENABLE_ARCH_pru_TRUE@am__append_95 = pru/run
-@SIM_ENABLE_ARCH_riscv_TRUE@am__append_96 = riscv/run
-@SIM_ENABLE_ARCH_rl78_TRUE@am__append_97 = rl78/run
-@SIM_ENABLE_ARCH_rx_TRUE@am__append_98 = rx/run
-@SIM_ENABLE_ARCH_sh_TRUE@am__append_99 = sh/run
-@SIM_ENABLE_ARCH_sh_TRUE@am__append_100 = \
+@SIM_ENABLE_ARCH_or1k_TRUE@am__append_94 = $(or1k_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_ppc_TRUE@am__append_95 = ppc/run ppc/psim
+@SIM_ENABLE_ARCH_pru_TRUE@am__append_96 = pru/run
+@SIM_ENABLE_ARCH_riscv_TRUE@am__append_97 = riscv/run
+@SIM_ENABLE_ARCH_rl78_TRUE@am__append_98 = rl78/run
+@SIM_ENABLE_ARCH_rx_TRUE@am__append_99 = rx/run
+@SIM_ENABLE_ARCH_sh_TRUE@am__append_100 = sh/run
+@SIM_ENABLE_ARCH_sh_TRUE@am__append_101 = \
 @SIM_ENABLE_ARCH_sh_TRUE@	sh/code.c \
 @SIM_ENABLE_ARCH_sh_TRUE@	sh/ppi.c
 
-@SIM_ENABLE_ARCH_sh_TRUE@am__append_101 = $(sh_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_sh_TRUE@am__append_102 = sh/gencode
-@SIM_ENABLE_ARCH_sh_TRUE@am__append_103 = $(sh_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_v850_TRUE@am__append_104 = v850/run
-@SIM_ENABLE_ARCH_v850_TRUE@am__append_105 = \
+@SIM_ENABLE_ARCH_sh_TRUE@am__append_102 = $(sh_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_sh_TRUE@am__append_103 = sh/gencode
+@SIM_ENABLE_ARCH_sh_TRUE@am__append_104 = $(sh_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_v850_TRUE@am__append_105 = v850/run
+@SIM_ENABLE_ARCH_v850_TRUE@am__append_106 = \
 @SIM_ENABLE_ARCH_v850_TRUE@	v850/icache.h \
 @SIM_ENABLE_ARCH_v850_TRUE@	v850/idecode.h \
 @SIM_ENABLE_ARCH_v850_TRUE@	v850/semantics.h \
@@ -285,8 +286,8 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \
 @SIM_ENABLE_ARCH_v850_TRUE@	v850/itable.h \
 @SIM_ENABLE_ARCH_v850_TRUE@	v850/engine.h
 
-@SIM_ENABLE_ARCH_v850_TRUE@am__append_106 = $(v850_BUILD_OUTPUTS)
 @SIM_ENABLE_ARCH_v850_TRUE@am__append_107 = $(v850_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_v850_TRUE@am__append_108 = $(v850_BUILD_OUTPUTS)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -441,6 +442,27 @@ cr16_libsim_a_AR = $(AR) $(ARFLAGS)
 @SIM_ENABLE_ARCH_cr16_TRUE@	cr16/table.o
 am_cr16_libsim_a_OBJECTS =
 cr16_libsim_a_OBJECTS = $(am_cr16_libsim_a_OBJECTS)
+cris_libsim_a_AR = $(AR) $(ARFLAGS)
+@SIM_ENABLE_ARCH_cris_TRUE@cris_libsim_a_DEPENDENCIES =  \
+@SIM_ENABLE_ARCH_cris_TRUE@	$(common_libcommon_a_OBJECTS) \
+@SIM_ENABLE_ARCH_cris_TRUE@	$(patsubst \
+@SIM_ENABLE_ARCH_cris_TRUE@	%,cris/%,$(SIM_NEW_COMMON_OBJS)) \
+@SIM_ENABLE_ARCH_cris_TRUE@	$(patsubst \
+@SIM_ENABLE_ARCH_cris_TRUE@	%,cris/dv-%.o,$(SIM_HW_DEVICES)) \
+@SIM_ENABLE_ARCH_cris_TRUE@	$(patsubst \
+@SIM_ENABLE_ARCH_cris_TRUE@	%,cris/dv-%.o,$(cris_SIM_EXTRA_HW_DEVICES)) \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/modules.o cris/cgen-run.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/cgen-scache.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/cgen-trace.o cris/cgen-utils.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/arch.o cris/crisv10f.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/cpuv10.o cris/decodev10.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/modelv10.o cris/mloopv10f.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/crisv32f.o cris/cpuv32.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/decodev32.o cris/modelv32.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/mloopv32f.o cris/sim-if.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/traps.o
+am_cris_libsim_a_OBJECTS =
+cris_libsim_a_OBJECTS = $(am_cris_libsim_a_OBJECTS)
 igen_libigen_a_AR = $(AR) $(ARFLAGS)
 igen_libigen_a_LIBADD =
 @SIM_ENABLE_IGEN_TRUE@am_igen_libigen_a_OBJECTS =  \
@@ -786,12 +808,13 @@ am__v_CCLD_1 =
 SOURCES = $(aarch64_libsim_a_SOURCES) $(arm_libsim_a_SOURCES) \
 	$(avr_libsim_a_SOURCES) $(bfin_libsim_a_SOURCES) \
 	$(bpf_libsim_a_SOURCES) $(common_libcommon_a_SOURCES) \
-	$(cr16_libsim_a_SOURCES) $(igen_libigen_a_SOURCES) \
-	$(aarch64_run_SOURCES) $(arm_run_SOURCES) $(avr_run_SOURCES) \
-	$(bfin_run_SOURCES) $(bpf_run_SOURCES) $(cr16_gencode_SOURCES) \
-	$(cr16_run_SOURCES) $(cris_run_SOURCES) \
-	$(cris_rvdummy_SOURCES) $(d10v_gencode_SOURCES) \
-	$(d10v_run_SOURCES) $(erc32_run_SOURCES) erc32/sis.c \
+	$(cr16_libsim_a_SOURCES) $(cris_libsim_a_SOURCES) \
+	$(igen_libigen_a_SOURCES) $(aarch64_run_SOURCES) \
+	$(arm_run_SOURCES) $(avr_run_SOURCES) $(bfin_run_SOURCES) \
+	$(bpf_run_SOURCES) $(cr16_gencode_SOURCES) $(cr16_run_SOURCES) \
+	$(cris_run_SOURCES) $(cris_rvdummy_SOURCES) \
+	$(d10v_gencode_SOURCES) $(d10v_run_SOURCES) \
+	$(erc32_run_SOURCES) erc32/sis.c \
 	$(example_synacor_run_SOURCES) $(frv_run_SOURCES) \
 	$(ft32_run_SOURCES) $(h8300_run_SOURCES) \
 	$(igen_filter_SOURCES) $(igen_gen_SOURCES) \
@@ -1342,33 +1365,33 @@ srccom = $(srcdir)/common
 srcroot = $(srcdir)/..
 SUBDIRS = @subdirs@ $(SIM_SUBDIRS)
 AM_MAKEFLAGS = SIM_NEW_COMMON_OBJS_="$(SIM_NEW_COMMON_OBJS)" \
-	$(am__append_3) $(am__append_16) $(am__append_29) \
-	$(am__append_54) $(am__append_63) $(am__append_68) \
-	$(am__append_75) $(am__append_84)
+	$(am__append_3) $(am__append_16) $(am__append_30) \
+	$(am__append_55) $(am__append_64) $(am__append_69) \
+	$(am__append_76) $(am__append_85)
 pkginclude_HEADERS = $(am__append_1)
 noinst_LIBRARIES = common/libcommon.a $(am__append_5) $(am__append_8) \
 	$(am__append_10) $(am__append_12) $(am__append_14) \
-	$(am__append_17) $(am__append_22)
-BUILT_SOURCES = $(am__append_19) $(am__append_24) $(am__append_31) \
-	$(am__append_35) $(am__append_44) $(am__append_50) \
-	$(am__append_55) $(am__append_64) $(am__append_76) \
-	$(am__append_85) $(am__append_91) $(am__append_100) \
-	$(am__append_105)
+	$(am__append_17) $(am__append_22) $(am__append_28)
+BUILT_SOURCES = $(am__append_19) $(am__append_24) $(am__append_32) \
+	$(am__append_36) $(am__append_45) $(am__append_51) \
+	$(am__append_56) $(am__append_65) $(am__append_77) \
+	$(am__append_86) $(am__append_92) $(am__append_101) \
+	$(am__append_106)
 CLEANFILES = common/version.c common/version.c-stamp \
 	testsuite/common/bits-gen testsuite/common/bits32m0.c \
 	testsuite/common/bits32m31.c testsuite/common/bits64m0.c \
 	testsuite/common/bits64m63.c
-DISTCLEANFILES = $(am__append_82)
+DISTCLEANFILES = $(am__append_83)
 MOSTLYCLEANFILES = core $(common_HW_CONFIG_H_TARGETS) $(patsubst \
 	%,%/stamp-hw,$(SIM_ENABLED_ARCHES)) \
 	$(common_GEN_MODULES_C_TARGETS) $(patsubst \
 	%,%/stamp-modules,$(SIM_ENABLED_ARCHES)) $(am__append_7) \
 	site-sim-config.exp testrun.log testrun.sum $(am__append_21) \
-	$(am__append_27) $(am__append_33) $(am__append_38) \
-	$(am__append_46) $(am__append_52) $(am__append_57) \
-	$(am__append_61) $(am__append_66) $(am__append_71) \
-	$(am__append_81) $(am__append_87) $(am__append_93) \
-	$(am__append_103) $(am__append_107)
+	$(am__append_27) $(am__append_34) $(am__append_39) \
+	$(am__append_47) $(am__append_53) $(am__append_58) \
+	$(am__append_62) $(am__append_67) $(am__append_72) \
+	$(am__append_82) $(am__append_88) $(am__append_94) \
+	$(am__append_104) $(am__append_108)
 AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \
 	$(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \
@@ -1380,14 +1403,14 @@ LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
 SIM_ALL_RECURSIVE_DEPS = common/libcommon.a \
 	$(common_HW_CONFIG_H_TARGETS) $(common_GEN_MODULES_C_TARGETS) \
 	$(am__append_4) $(am__append_20) $(am__append_25) \
-	$(am__append_32) $(am__append_36) $(am__append_45) \
-	$(am__append_51) $(am__append_56) $(am__append_59) \
-	$(am__append_65) $(am__append_69) $(am__append_80) \
-	$(am__append_86) $(am__append_92) $(am__append_101) \
-	$(am__append_106)
+	$(am__append_33) $(am__append_37) $(am__append_46) \
+	$(am__append_52) $(am__append_57) $(am__append_60) \
+	$(am__append_66) $(am__append_70) $(am__append_81) \
+	$(am__append_87) $(am__append_93) $(am__append_102) \
+	$(am__append_107)
 SIM_INSTALL_DATA_LOCAL_DEPS = 
-SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_40)
-SIM_UNINSTALL_LOCAL_DEPS = $(am__append_41)
+SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_41)
+SIM_UNINSTALL_LOCAL_DEPS = $(am__append_42)
 common_libcommon_a_SOURCES = \
 	common/callback.c \
 	common/portability.c \
@@ -1721,6 +1744,34 @@ testsuite_common_CPPFLAGS = \
 
 @SIM_ENABLE_ARCH_cr16_TRUE@cr16_gencode_SOURCES = cr16/gencode.c
 @SIM_ENABLE_ARCH_cr16_TRUE@cr16_gencode_LDADD = cr16/cr16-opc.o
+@SIM_ENABLE_ARCH_cris_TRUE@cris_libsim_a_SOURCES = 
+@SIM_ENABLE_ARCH_cris_TRUE@cris_libsim_a_LIBADD = \
+@SIM_ENABLE_ARCH_cris_TRUE@	$(common_libcommon_a_OBJECTS) \
+@SIM_ENABLE_ARCH_cris_TRUE@	$(patsubst %,cris/%,$(SIM_NEW_COMMON_OBJS)) \
+@SIM_ENABLE_ARCH_cris_TRUE@	$(patsubst %,cris/dv-%.o,$(SIM_HW_DEVICES)) \
+@SIM_ENABLE_ARCH_cris_TRUE@	$(patsubst %,cris/dv-%.o,$(cris_SIM_EXTRA_HW_DEVICES)) \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/modules.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	\
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/cgen-run.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/cgen-scache.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/cgen-trace.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/cgen-utils.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	\
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/arch.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/crisv10f.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/cpuv10.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/decodev10.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/modelv10.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/mloopv10f.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/crisv32f.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/cpuv32.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/decodev32.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/modelv32.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/mloopv32f.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	\
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/sim-if.o \
+@SIM_ENABLE_ARCH_cris_TRUE@	cris/traps.o
+
 @SIM_ENABLE_ARCH_cris_TRUE@cris_run_SOURCES = 
 @SIM_ENABLE_ARCH_cris_TRUE@cris_run_LDADD = \
 @SIM_ENABLE_ARCH_cris_TRUE@	cris/nrun.o \
@@ -1915,8 +1966,8 @@ testsuite_common_CPPFLAGS = \
 @SIM_ENABLE_ARCH_mips_TRUE@mips_BUILD_OUTPUTS =  \
 @SIM_ENABLE_ARCH_mips_TRUE@	$(mips_BUILT_SRC_FROM_IGEN_ITABLE) \
 @SIM_ENABLE_ARCH_mips_TRUE@	mips/stamp-igen-itable \
-@SIM_ENABLE_ARCH_mips_TRUE@	$(am__append_77) $(am__append_78) \
-@SIM_ENABLE_ARCH_mips_TRUE@	$(am__append_79)
+@SIM_ENABLE_ARCH_mips_TRUE@	$(am__append_78) $(am__append_79) \
+@SIM_ENABLE_ARCH_mips_TRUE@	$(am__append_80)
 @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_TRACE = # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries # -G trace-all
 @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_INSN = $(srcdir)/mips/mips.igen
 @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_INSN_INC = \
@@ -2337,6 +2388,14 @@ cr16/libsim.a: $(cr16_libsim_a_OBJECTS) $(cr16_libsim_a_DEPENDENCIES) $(EXTRA_cr
 	$(AM_V_at)-rm -f cr16/libsim.a
 	$(AM_V_AR)$(cr16_libsim_a_AR) cr16/libsim.a $(cr16_libsim_a_OBJECTS) $(cr16_libsim_a_LIBADD)
 	$(AM_V_at)$(RANLIB) cr16/libsim.a
+cris/$(am__dirstamp):
+	@$(MKDIR_P) cris
+	@: > cris/$(am__dirstamp)
+
+cris/libsim.a: $(cris_libsim_a_OBJECTS) $(cris_libsim_a_DEPENDENCIES) $(EXTRA_cris_libsim_a_DEPENDENCIES) cris/$(am__dirstamp)
+	$(AM_V_at)-rm -f cris/libsim.a
+	$(AM_V_AR)$(cris_libsim_a_AR) cris/libsim.a $(cris_libsim_a_OBJECTS) $(cris_libsim_a_LIBADD)
+	$(AM_V_at)$(RANLIB) cris/libsim.a
 igen/$(am__dirstamp):
 	@$(MKDIR_P) igen
 	@: > igen/$(am__dirstamp)
@@ -2430,9 +2489,6 @@ cr16/gencode.$(OBJEXT): cr16/$(am__dirstamp) \
 cr16/run$(EXEEXT): $(cr16_run_OBJECTS) $(cr16_run_DEPENDENCIES) $(EXTRA_cr16_run_DEPENDENCIES) cr16/$(am__dirstamp)
 	@rm -f cr16/run$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(cr16_run_OBJECTS) $(cr16_run_LDADD) $(LIBS)
-cris/$(am__dirstamp):
-	@$(MKDIR_P) cris
-	@: > cris/$(am__dirstamp)
 
 cris/run$(EXEEXT): $(cris_run_OBJECTS) $(cris_run_DEPENDENCIES) $(EXTRA_cris_run_DEPENDENCIES) cris/$(am__dirstamp)
 	@rm -f cris/run$(EXEEXT)
@@ -3824,6 +3880,13 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
 
 @SIM_ENABLE_ARCH_cr16_TRUE@cr16/table.c: cr16/gencode$(EXEEXT)
 @SIM_ENABLE_ARCH_cr16_TRUE@	$(AM_V_GEN)$< >$@
+@SIM_ENABLE_ARCH_cris_TRUE@$(cris_libsim_a_OBJECTS) $(cris_libsim_a_LIBADD): cris/hw-config.h
+
+@SIM_ENABLE_ARCH_cris_TRUE@cris/%.o: cris/%.c
+@SIM_ENABLE_ARCH_cris_TRUE@	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+
+@SIM_ENABLE_ARCH_cris_TRUE@cris/%.o: common/%.c
+@SIM_ENABLE_ARCH_cris_TRUE@	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 @SIM_ENABLE_ARCH_cris_TRUE@cris/modules.c: | $(cris_BUILD_OUTPUTS)
 
 @SIM_ENABLE_ARCH_cris_TRUE@cris/mloopv10f.c cris/engv10.h: cris/stamp-mloop-v10f ; @true
diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in
index 0a045ca..142825f 100644
--- a/sim/cris/Makefile.in
+++ b/sim/cris/Makefile.in
@@ -21,16 +21,6 @@
 
 arch = cris
 
-CRISV10F_OBJS = crisv10f.o cpuv10.o decodev10.o modelv10.o mloopv10f.o
-CRISV32F_OBJS = crisv32f.o cpuv32.o decodev32.o modelv32.o mloopv32f.o
-
-SIM_OBJS = \
-	$(SIM_NEW_COMMON_OBJS) \
-	cgen-utils.o cgen-trace.o cgen-scache.o \
-	cgen-run.o \
-	sim-if.o arch.o \
-	$(CRISV10F_OBJS) \
-	$(CRISV32F_OBJS) \
-	traps.o
+SIM_LIBSIM =
 
 ## COMMON_POST_CONFIG_FRAG
diff --git a/sim/cris/local.mk b/sim/cris/local.mk
index d55e7b8..912ca12 100644
--- a/sim/cris/local.mk
+++ b/sim/cris/local.mk
@@ -16,6 +16,43 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+%C%_libsim_a_SOURCES =
+%C%_libsim_a_LIBADD = \
+	$(common_libcommon_a_OBJECTS) \
+	$(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \
+	$(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \
+	$(patsubst %,%D%/dv-%.o,$(%C%_SIM_EXTRA_HW_DEVICES)) \
+	%D%/modules.o \
+	\
+	%D%/cgen-run.o \
+	%D%/cgen-scache.o \
+	%D%/cgen-trace.o \
+	%D%/cgen-utils.o \
+	\
+	%D%/arch.o \
+	%D%/crisv10f.o \
+	%D%/cpuv10.o \
+	%D%/decodev10.o \
+	%D%/modelv10.o \
+	%D%/mloopv10f.o \
+	%D%/crisv32f.o \
+	%D%/cpuv32.o \
+	%D%/decodev32.o \
+	%D%/modelv32.o \
+	%D%/mloopv32f.o \
+	\
+	%D%/sim-if.o \
+	%D%/traps.o
+$(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
+
+noinst_LIBRARIES += %D%/libsim.a
+
+%D%/%.o: %D%/%.c
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+
+%D%/%.o: common/%.c
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+
 %C%_run_SOURCES =
 %C%_run_LDADD = \
 	%D%/nrun.o \