From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 91EB33858409; Tue, 10 Jan 2023 06:24:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 91EB33858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673331856; bh=k//3GHfFNNwW4s3SBK8OhOOFr7nc9hH2VVwos4/FcWs=; h=From:To:Subject:Date:From; b=gEMNSu+Lku8pUTCDDOzXjI8GYOqFWaKMpkkdQy+R3W378JMNfhFMZyzGviuzaMchX /Rb8LJfTsOk6WL/wnqrBbJWWG4fqFmQvcQ7hj05KZmyZqOFOve9kvVFFIfikpnfnyG sGlAqDzjrLLFAO1Mn191WCWOiz60F+MvorC6B38c= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: mcore: move libsim.a creation to top-level X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: ccb680718a351c5854046126d8ad66278ec8c457 X-Git-Newrev: dfceaa0dc36567a27d904af60c9c14d30eaa4842 Message-Id: <20230110062416.91EB33858409@sourceware.org> Date: Tue, 10 Jan 2023 06:24:16 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Ddfceaa0dc365= 67a27d904af60c9c14d30eaa4842 commit dfceaa0dc36567a27d904af60c9c14d30eaa4842 Author: Mike Frysinger Date: Mon Dec 26 22:01:29 2022 -0500 sim: mcore: move libsim.a creation to top-level =20 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. =20 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. Diff: --- sim/Makefile.in | 139 +++++++++++++++++++++++++++++++---------------= ---- sim/mcore/Makefile.in | 5 +- sim/mcore/local.mk | 18 +++++++ 3 files changed, 105 insertions(+), 57 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 40cddb4bbe6..856e0ddc8d1 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -231,33 +231,34 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_81 =3D $(m68hc11_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_82 =3D m68hc11/gencode @SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_83 =3D $(m68hc11_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mcore_TRUE@am__append_84 =3D mcore/run -@SIM_ENABLE_ARCH_microblaze_TRUE@am__append_85 =3D microblaze/run -@SIM_ENABLE_ARCH_mips_TRUE@am__append_86 =3D mips/run -@SIM_ENABLE_ARCH_mips_TRUE@am__append_87 =3D mips_SIM_EXTRA_HW_DEVICES=3D"= $(mips_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mips_TRUE@am__append_88 =3D mips/itable.h \ +@SIM_ENABLE_ARCH_mcore_TRUE@am__append_84 =3D mcore/libsim.a +@SIM_ENABLE_ARCH_mcore_TRUE@am__append_85 =3D mcore/run +@SIM_ENABLE_ARCH_microblaze_TRUE@am__append_86 =3D microblaze/run +@SIM_ENABLE_ARCH_mips_TRUE@am__append_87 =3D mips/run +@SIM_ENABLE_ARCH_mips_TRUE@am__append_88 =3D mips_SIM_EXTRA_HW_DEVICES=3D"= $(mips_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_mips_TRUE@am__append_89 =3D 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_89 = =3D \ +@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@am__append_90 = =3D \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@ $(mips_BUILT_SR= C_FROM_GEN_MODE_SINGLE) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@ mips/stamp-gen-= mode-single =20 -@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@am__append_90 =3D \ +@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@am__append_91 =3D \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ $(mips_BUILT_SRC_F= ROM_GEN_MODE_M16_M16) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ $(mips_BUILT_SRC_F= ROM_GEN_MODE_M16_M32) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ mips/stamp-gen-mod= e-m16-m16 \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ mips/stamp-gen-mod= e-m16-m32 =20 -@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@am__append_91 =3D= \ +@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@am__append_92 =3D= \ @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-m= ode-multi-igen \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@ mips/stamp-gen-m= ode-multi-run =20 -@SIM_ENABLE_ARCH_mips_TRUE@am__append_92 =3D $(mips_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mips_TRUE@am__append_93 =3D $(mips_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mips_TRUE@am__append_94 =3D mips/multi-include.h mips/mul= ti-run.c -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_95 =3D mn10300/run -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_96 =3D mn10300_SIM_EXTRA_HW_DEVIC= ES=3D"$(mn10300_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_97 =3D \ +@SIM_ENABLE_ARCH_mips_TRUE@am__append_94 =3D $(mips_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mips_TRUE@am__append_95 =3D mips/multi-include.h mips/mul= ti-run.c +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_96 =3D mn10300/run +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_97 =3D mn10300_SIM_EXTRA_HW_DEVIC= ES=3D"$(mn10300_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_98 =3D \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/icache.h \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/idecode.h \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/semantics.h \ @@ -266,29 +267,29 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/itable.h \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/engine.h =20 -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_98 =3D $(mn10300_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_99 =3D $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_moxie_TRUE@am__append_100 =3D moxie/run -@SIM_ENABLE_ARCH_msp430_TRUE@am__append_101 =3D msp430/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_102 =3D or1k/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_103 =3D or1k/eng.h -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_104 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_100 =3D $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_101 =3D moxie/run +@SIM_ENABLE_ARCH_msp430_TRUE@am__append_102 =3D msp430/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_103 =3D or1k/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_104 =3D or1k/eng.h @SIM_ENABLE_ARCH_or1k_TRUE@am__append_105 =3D $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ppc_TRUE@am__append_106 =3D ppc/run ppc/psim -@SIM_ENABLE_ARCH_pru_TRUE@am__append_107 =3D pru/run -@SIM_ENABLE_ARCH_riscv_TRUE@am__append_108 =3D riscv/run -@SIM_ENABLE_ARCH_rl78_TRUE@am__append_109 =3D rl78/run -@SIM_ENABLE_ARCH_rx_TRUE@am__append_110 =3D rx/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_111 =3D sh/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_112 =3D \ +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_106 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_107 =3D ppc/run ppc/psim +@SIM_ENABLE_ARCH_pru_TRUE@am__append_108 =3D pru/run +@SIM_ENABLE_ARCH_riscv_TRUE@am__append_109 =3D riscv/run +@SIM_ENABLE_ARCH_rl78_TRUE@am__append_110 =3D rl78/run +@SIM_ENABLE_ARCH_rx_TRUE@am__append_111 =3D rx/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_112 =3D sh/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_113 =3D \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/code.c \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/ppi.c =20 -@SIM_ENABLE_ARCH_sh_TRUE@am__append_113 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_114 =3D sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_115 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_116 =3D v850/run -@SIM_ENABLE_ARCH_v850_TRUE@am__append_117 =3D \ +@SIM_ENABLE_ARCH_sh_TRUE@am__append_114 =3D $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_115 =3D sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_116 =3D $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_117 =3D v850/run +@SIM_ENABLE_ARCH_v850_TRUE@am__append_118 =3D \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/icache.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/idecode.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/semantics.h \ @@ -297,8 +298,8 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/itable.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/engine.h =20 -@SIM_ENABLE_ARCH_v850_TRUE@am__append_118 =3D $(v850_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_v850_TRUE@am__append_119 =3D $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_120 =3D $(v850_BUILD_OUTPUTS) subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../config/acx.m4 \ @@ -661,6 +662,16 @@ m68hc11_libsim_a_AR =3D $(AR) $(ARFLAGS) @SIM_ENABLE_ARCH_m68hc11_TRUE@ m68hc11/sim-resume.o am_m68hc11_libsim_a_OBJECTS =3D m68hc11_libsim_a_OBJECTS =3D $(am_m68hc11_libsim_a_OBJECTS) +mcore_libsim_a_AR =3D $(AR) $(ARFLAGS) +@SIM_ENABLE_ARCH_mcore_TRUE@mcore_libsim_a_DEPENDENCIES =3D \ +@SIM_ENABLE_ARCH_mcore_TRUE@ $(common_libcommon_a_OBJECTS) \ +@SIM_ENABLE_ARCH_mcore_TRUE@ mcore/interp.o $(patsubst \ +@SIM_ENABLE_ARCH_mcore_TRUE@ %,mcore/%,$(SIM_NEW_COMMON_OBJS)) \ +@SIM_ENABLE_ARCH_mcore_TRUE@ $(patsubst \ +@SIM_ENABLE_ARCH_mcore_TRUE@ %,mcore/dv-%.o,$(SIM_HW_DEVICES)) \ +@SIM_ENABLE_ARCH_mcore_TRUE@ mcore/modules.o mcore/sim-resume.o +am_mcore_libsim_a_OBJECTS =3D +mcore_libsim_a_OBJECTS =3D $(am_mcore_libsim_a_OBJECTS) @SIM_ENABLE_IGEN_TRUE@am__EXEEXT_1 =3D $(IGEN) igen/filter$(EXEEXT) \ @SIM_ENABLE_IGEN_TRUE@ igen/gen$(EXEEXT) igen/ld-cache$(EXEEXT) \ @SIM_ENABLE_IGEN_TRUE@ igen/ld-decode$(EXEEXT) \ @@ -994,11 +1005,12 @@ SOURCES =3D $(aarch64_libsim_a_SOURCES) $(arm_libsim= _a_SOURCES) \ $(igen_libigen_a_SOURCES) $(iq2000_libsim_a_SOURCES) \ $(lm32_libsim_a_SOURCES) $(m32c_libsim_a_SOURCES) \ $(m32r_libsim_a_SOURCES) $(m68hc11_libsim_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 \ + $(mcore_libsim_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) \ @@ -1551,7 +1563,7 @@ SUBDIRS =3D @subdirs@ $(SIM_SUBDIRS) AM_MAKEFLAGS =3D SIM_NEW_COMMON_OBJS_=3D"$(SIM_NEW_COMMON_OBJS)" \ $(am__append_3) $(am__append_16) $(am__append_30) \ $(am__append_63) $(am__append_74) $(am__append_80) \ - $(am__append_87) $(am__append_96) + $(am__append_88) $(am__append_97) pkginclude_HEADERS =3D $(am__append_1) noinst_LIBRARIES =3D common/libcommon.a $(am__append_5) $(am__append_8) \ $(am__append_10) $(am__append_12) $(am__append_14) \ @@ -1559,17 +1571,17 @@ noinst_LIBRARIES =3D common/libcommon.a $(am__appen= d_5) $(am__append_8) \ $(am__append_35) $(am__append_41) $(am__append_45) \ $(am__append_47) $(am__append_52) $(am__append_54) \ $(am__append_56) $(am__append_61) $(am__append_67) \ - $(am__append_72) $(am__append_78) + $(am__append_72) $(am__append_78) $(am__append_84) BUILT_SOURCES =3D $(am__append_19) $(am__append_24) $(am__append_32) \ $(am__append_37) $(am__append_49) $(am__append_58) \ - $(am__append_64) $(am__append_75) $(am__append_88) \ - $(am__append_97) $(am__append_103) $(am__append_112) \ - $(am__append_117) + $(am__append_64) $(am__append_75) $(am__append_89) \ + $(am__append_98) $(am__append_104) $(am__append_113) \ + $(am__append_118) CLEANFILES =3D 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 =3D $(am__append_94) +DISTCLEANFILES =3D $(am__append_95) MOSTLYCLEANFILES =3D core $(common_HW_CONFIG_H_TARGETS) $(patsubst \ %,%/stamp-hw,$(SIM_ENABLED_ARCHES)) \ $(common_GEN_MODULES_C_TARGETS) $(patsubst \ @@ -1578,8 +1590,8 @@ MOSTLYCLEANFILES =3D core $(common_HW_CONFIG_H_TARGET= S) $(patsubst \ $(am__append_27) $(am__append_34) $(am__append_40) \ $(am__append_51) $(am__append_60) $(am__append_66) \ $(am__append_71) $(am__append_77) $(am__append_83) \ - $(am__append_93) $(am__append_99) $(am__append_105) \ - $(am__append_115) $(am__append_119) + $(am__append_94) $(am__append_100) $(am__append_106) \ + $(am__append_116) $(am__append_120) AM_CFLAGS =3D $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS =3D $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \ @@ -1593,9 +1605,9 @@ SIM_ALL_RECURSIVE_DEPS =3D common/libcommon.a \ $(am__append_4) $(am__append_20) $(am__append_25) \ $(am__append_33) $(am__append_38) $(am__append_50) \ $(am__append_59) $(am__append_65) $(am__append_69) \ - $(am__append_76) $(am__append_81) $(am__append_92) \ - $(am__append_98) $(am__append_104) $(am__append_113) \ - $(am__append_118) + $(am__append_76) $(am__append_81) $(am__append_93) \ + $(am__append_99) $(am__append_105) $(am__append_114) \ + $(am__append_119) SIM_INSTALL_DATA_LOCAL_DEPS =3D=20 SIM_INSTALL_EXEC_LOCAL_DEPS =3D $(am__append_43) SIM_UNINSTALL_LOCAL_DEPS =3D $(am__append_44) @@ -2294,6 +2306,15 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_m68hc11_TRUE@ m68hc11/m68hc12int.c =20 @SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11_gencode_SOURCES =3D m68hc11/gencode.c +@SIM_ENABLE_ARCH_mcore_TRUE@mcore_libsim_a_SOURCES =3D=20 +@SIM_ENABLE_ARCH_mcore_TRUE@mcore_libsim_a_LIBADD =3D \ +@SIM_ENABLE_ARCH_mcore_TRUE@ $(common_libcommon_a_OBJECTS) \ +@SIM_ENABLE_ARCH_mcore_TRUE@ mcore/interp.o \ +@SIM_ENABLE_ARCH_mcore_TRUE@ $(patsubst %,mcore/%,$(SIM_NEW_COMMON_OBJS)) \ +@SIM_ENABLE_ARCH_mcore_TRUE@ $(patsubst %,mcore/dv-%.o,$(SIM_HW_DEVICES)) \ +@SIM_ENABLE_ARCH_mcore_TRUE@ mcore/modules.o \ +@SIM_ENABLE_ARCH_mcore_TRUE@ mcore/sim-resume.o + @SIM_ENABLE_ARCH_mcore_TRUE@mcore_run_SOURCES =3D=20 @SIM_ENABLE_ARCH_mcore_TRUE@mcore_run_LDADD =3D \ @SIM_ENABLE_ARCH_mcore_TRUE@ mcore/nrun.o \ @@ -2358,8 +2379,8 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_mips_TRUE@mips_BUILD_OUTPUTS =3D \ @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_89) $(am__append_90) \ -@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_91) +@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_90) $(am__append_91) \ +@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_92) @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_TRACE =3D # -G omit-line-numbers # -G= trace-rule-selection -G trace-rule-rejection -G trace-entries # -G trace-a= ll @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_INSN =3D $(srcdir)/mips/mips.igen @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_INSN_INC =3D \ @@ -2918,6 +2939,14 @@ m68hc11/libsim.a: $(m68hc11_libsim_a_OBJECTS) $(m68h= c11_libsim_a_DEPENDENCIES) $ $(AM_V_at)-rm -f m68hc11/libsim.a $(AM_V_AR)$(m68hc11_libsim_a_AR) m68hc11/libsim.a $(m68hc11_libsim_a_OBJE= CTS) $(m68hc11_libsim_a_LIBADD) $(AM_V_at)$(RANLIB) m68hc11/libsim.a +mcore/$(am__dirstamp): + @$(MKDIR_P) mcore + @: > mcore/$(am__dirstamp) + +mcore/libsim.a: $(mcore_libsim_a_OBJECTS) $(mcore_libsim_a_DEPENDENCIES) $= (EXTRA_mcore_libsim_a_DEPENDENCIES) mcore/$(am__dirstamp) + $(AM_V_at)-rm -f mcore/libsim.a + $(AM_V_AR)$(mcore_libsim_a_AR) mcore/libsim.a $(mcore_libsim_a_OBJECTS) $= (mcore_libsim_a_LIBADD) + $(AM_V_at)$(RANLIB) mcore/libsim.a =20 clean-checkPROGRAMS: @list=3D'$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -3092,9 +3121,6 @@ m68hc11/gencode.$(OBJEXT): m68hc11/$(am__dirstamp) \ m68hc11/run$(EXEEXT): $(m68hc11_run_OBJECTS) $(m68hc11_run_DEPENDENCIES) $= (EXTRA_m68hc11_run_DEPENDENCIES) m68hc11/$(am__dirstamp) @rm -f m68hc11/run$(EXEEXT) $(AM_V_CCLD)$(LINK) $(m68hc11_run_OBJECTS) $(m68hc11_run_LDADD) $(LIBS) -mcore/$(am__dirstamp): - @$(MKDIR_P) mcore - @: > mcore/$(am__dirstamp) =20 mcore/run$(EXEEXT): $(mcore_run_OBJECTS) $(mcore_run_DEPENDENCIES) $(EXTRA= _mcore_run_DEPENDENCIES) mcore/$(am__dirstamp) @rm -f mcore/run$(EXEEXT) @@ -4618,6 +4644,13 @@ testsuite/common/bits64m63.c: testsuite/common/bits-= gen$(EXEEXT) testsuite/commo =20 @SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11/m68hc12int.c: m68hc11/gencode$(EXEEX= T) @SIM_ENABLE_ARCH_m68hc11_TRUE@ $(AM_V_GEN)$< -m6812 >$@ +@SIM_ENABLE_ARCH_mcore_TRUE@$(mcore_libsim_a_OBJECTS) $(mcore_libsim_a_LIB= ADD): mcore/hw-config.h + +@SIM_ENABLE_ARCH_mcore_TRUE@mcore/%.o: mcore/%.c +@SIM_ENABLE_ARCH_mcore_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(= @F) + +@SIM_ENABLE_ARCH_mcore_TRUE@mcore/%.o: common/%.c +@SIM_ENABLE_ARCH_mcore_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(= @F) @SIM_ENABLE_ARCH_mips_TRUE@mips/modules.c: | $(mips_BUILD_OUTPUTS) =20 @SIM_ENABLE_ARCH_mips_TRUE@$(mips_BUILT_SRC_FROM_IGEN_ITABLE): mips/stamp-= igen-itable diff --git a/sim/mcore/Makefile.in b/sim/mcore/Makefile.in index 4f9272a554b..502e8a44a73 100644 --- a/sim/mcore/Makefile.in +++ b/sim/mcore/Makefile.in @@ -17,9 +17,6 @@ =20 ## COMMON_PRE_CONFIG_FRAG =20 -SIM_OBJS =3D \ - interp.o \ - $(SIM_NEW_COMMON_OBJS) \ - sim-resume.o +SIM_LIBSIM =3D =20 ## COMMON_POST_CONFIG_FRAG diff --git a/sim/mcore/local.mk b/sim/mcore/local.mk index c9fc789113e..94abebc1dbb 100644 --- a/sim/mcore/local.mk +++ b/sim/mcore/local.mk @@ -16,6 +16,24 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . =20 +%C%_libsim_a_SOURCES =3D +%C%_libsim_a_LIBADD =3D \ + $(common_libcommon_a_OBJECTS) \ + %D%/interp.o \ + $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \ + $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \ + %D%/modules.o \ + %D%/sim-resume.o +$(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h + +noinst_LIBRARIES +=3D %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 =3D %C%_run_LDADD =3D \ %D%/nrun.o \