From 0754b6259176e6709244163de9553bf7a99fca59 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 26 Dec 2022 22:15:08 -0500 Subject: [PATCH] sim: moxie: 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. --- sim/Makefile.in | 101 ++++++++++++++++++++++++++++-------------- sim/moxie/Makefile.in | 5 +-- sim/moxie/local.mk | 18 ++++++++ 3 files changed, 87 insertions(+), 37 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 14d801b5eab..09d2e854e62 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -300,27 +300,28 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_105 = $(mn10300_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_106 = $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_moxie_TRUE@am__append_107 = moxie/run -@SIM_ENABLE_ARCH_msp430_TRUE@am__append_108 = msp430/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_109 = or1k/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_110 = or1k/eng.h -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_111 = $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_107 = moxie/libsim.a +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_108 = moxie/run +@SIM_ENABLE_ARCH_msp430_TRUE@am__append_109 = msp430/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_110 = or1k/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_111 = or1k/eng.h @SIM_ENABLE_ARCH_or1k_TRUE@am__append_112 = $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ppc_TRUE@am__append_113 = ppc/run ppc/psim -@SIM_ENABLE_ARCH_pru_TRUE@am__append_114 = pru/run -@SIM_ENABLE_ARCH_riscv_TRUE@am__append_115 = riscv/run -@SIM_ENABLE_ARCH_rl78_TRUE@am__append_116 = rl78/run -@SIM_ENABLE_ARCH_rx_TRUE@am__append_117 = rx/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_118 = sh/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_119 = \ +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_113 = $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_114 = ppc/run ppc/psim +@SIM_ENABLE_ARCH_pru_TRUE@am__append_115 = pru/run +@SIM_ENABLE_ARCH_riscv_TRUE@am__append_116 = riscv/run +@SIM_ENABLE_ARCH_rl78_TRUE@am__append_117 = rl78/run +@SIM_ENABLE_ARCH_rx_TRUE@am__append_118 = rx/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_119 = sh/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_120 = \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/code.c \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/ppi.c -@SIM_ENABLE_ARCH_sh_TRUE@am__append_120 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_121 = sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_122 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_123 = v850/run -@SIM_ENABLE_ARCH_v850_TRUE@am__append_124 = \ +@SIM_ENABLE_ARCH_sh_TRUE@am__append_121 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_122 = sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_123 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_124 = v850/run +@SIM_ENABLE_ARCH_v850_TRUE@am__append_125 = \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/icache.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/idecode.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/semantics.h \ @@ -329,8 +330,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_125 = $(v850_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_v850_TRUE@am__append_126 = $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_127 = $(v850_BUILD_OUTPUTS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -756,6 +757,17 @@ mn10300_libsim_a_AR = $(AR) $(ARFLAGS) @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/sim-resume.o am_mn10300_libsim_a_OBJECTS = mn10300_libsim_a_OBJECTS = $(am_mn10300_libsim_a_OBJECTS) +moxie_libsim_a_AR = $(AR) $(ARFLAGS) +@SIM_ENABLE_ARCH_moxie_TRUE@moxie_libsim_a_DEPENDENCIES = \ +@SIM_ENABLE_ARCH_moxie_TRUE@ $(common_libcommon_a_OBJECTS) \ +@SIM_ENABLE_ARCH_moxie_TRUE@ $(patsubst \ +@SIM_ENABLE_ARCH_moxie_TRUE@ %,moxie/%,$(SIM_NEW_COMMON_OBJS)) \ +@SIM_ENABLE_ARCH_moxie_TRUE@ $(patsubst \ +@SIM_ENABLE_ARCH_moxie_TRUE@ %,moxie/dv-%.o,$(SIM_HW_DEVICES)) \ +@SIM_ENABLE_ARCH_moxie_TRUE@ moxie/interp.o moxie/modules.o \ +@SIM_ENABLE_ARCH_moxie_TRUE@ moxie/sim-resume.o +am_moxie_libsim_a_OBJECTS = +moxie_libsim_a_OBJECTS = $(am_moxie_libsim_a_OBJECTS) @SIM_ENABLE_IGEN_TRUE@am__EXEEXT_1 = $(IGEN) igen/filter$(EXEEXT) \ @SIM_ENABLE_IGEN_TRUE@ igen/gen$(EXEEXT) igen/ld-cache$(EXEEXT) \ @SIM_ENABLE_IGEN_TRUE@ igen/ld-decode$(EXEEXT) \ @@ -1090,11 +1102,12 @@ SOURCES = $(aarch64_libsim_a_SOURCES) $(arm_libsim_a_SOURCES) \ $(m32r_libsim_a_SOURCES) $(m68hc11_libsim_a_SOURCES) \ $(mcore_libsim_a_SOURCES) $(microblaze_libsim_a_SOURCES) \ $(mips_libsim_a_SOURCES) $(mn10300_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 \ + $(moxie_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) \ @@ -1656,12 +1669,13 @@ noinst_LIBRARIES = common/libcommon.a $(am__append_5) $(am__append_8) \ $(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_84) \ - $(am__append_86) $(am__append_91) $(am__append_101) + $(am__append_86) $(am__append_91) $(am__append_101) \ + $(am__append_107) BUILT_SOURCES = $(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_94) \ - $(am__append_104) $(am__append_110) $(am__append_119) \ - $(am__append_124) + $(am__append_104) $(am__append_111) $(am__append_120) \ + $(am__append_125) CLEANFILES = common/version.c common/version.c-stamp \ testsuite/common/bits-gen testsuite/common/bits32m0.c \ testsuite/common/bits32m31.c testsuite/common/bits64m0.c \ @@ -1675,8 +1689,8 @@ MOSTLYCLEANFILES = core $(common_HW_CONFIG_H_TARGETS) $(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_99) $(am__append_106) $(am__append_112) \ - $(am__append_122) $(am__append_126) + $(am__append_99) $(am__append_106) $(am__append_113) \ + $(am__append_123) $(am__append_127) AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \ @@ -1691,8 +1705,8 @@ SIM_ALL_RECURSIVE_DEPS = common/libcommon.a \ $(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_98) \ - $(am__append_105) $(am__append_111) $(am__append_120) \ - $(am__append_125) + $(am__append_105) $(am__append_112) $(am__append_121) \ + $(am__append_126) SIM_INSTALL_DATA_LOCAL_DEPS = SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_43) SIM_UNINSTALL_LOCAL_DEPS = $(am__append_44) @@ -2564,6 +2578,15 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_IGEN_INSN = $(srcdir)/mn10300/mn10300.igen @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_IGEN_INSN_INC = mn10300/am33.igen mn10300/am33-2.igen @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_IGEN_DC = $(srcdir)/mn10300/mn10300.dc +@SIM_ENABLE_ARCH_moxie_TRUE@moxie_libsim_a_SOURCES = +@SIM_ENABLE_ARCH_moxie_TRUE@moxie_libsim_a_LIBADD = \ +@SIM_ENABLE_ARCH_moxie_TRUE@ $(common_libcommon_a_OBJECTS) \ +@SIM_ENABLE_ARCH_moxie_TRUE@ $(patsubst %,moxie/%,$(SIM_NEW_COMMON_OBJS)) \ +@SIM_ENABLE_ARCH_moxie_TRUE@ $(patsubst %,moxie/dv-%.o,$(SIM_HW_DEVICES)) \ +@SIM_ENABLE_ARCH_moxie_TRUE@ moxie/interp.o \ +@SIM_ENABLE_ARCH_moxie_TRUE@ moxie/modules.o \ +@SIM_ENABLE_ARCH_moxie_TRUE@ moxie/sim-resume.o + @SIM_ENABLE_ARCH_moxie_TRUE@moxie_run_SOURCES = @SIM_ENABLE_ARCH_moxie_TRUE@moxie_run_LDADD = \ @SIM_ENABLE_ARCH_moxie_TRUE@ moxie/nrun.o \ @@ -3101,6 +3124,14 @@ mn10300/libsim.a: $(mn10300_libsim_a_OBJECTS) $(mn10300_libsim_a_DEPENDENCIES) $ $(AM_V_at)-rm -f mn10300/libsim.a $(AM_V_AR)$(mn10300_libsim_a_AR) mn10300/libsim.a $(mn10300_libsim_a_OBJECTS) $(mn10300_libsim_a_LIBADD) $(AM_V_at)$(RANLIB) mn10300/libsim.a +moxie/$(am__dirstamp): + @$(MKDIR_P) moxie + @: > moxie/$(am__dirstamp) + +moxie/libsim.a: $(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_DEPENDENCIES) $(EXTRA_moxie_libsim_a_DEPENDENCIES) moxie/$(am__dirstamp) + $(AM_V_at)-rm -f moxie/libsim.a + $(AM_V_AR)$(moxie_libsim_a_AR) moxie/libsim.a $(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_LIBADD) + $(AM_V_at)$(RANLIB) moxie/libsim.a clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -3291,9 +3322,6 @@ mips/run$(EXEEXT): $(mips_run_OBJECTS) $(mips_run_DEPENDENCIES) $(EXTRA_mips_run mn10300/run$(EXEEXT): $(mn10300_run_OBJECTS) $(mn10300_run_DEPENDENCIES) $(EXTRA_mn10300_run_DEPENDENCIES) mn10300/$(am__dirstamp) @rm -f mn10300/run$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mn10300_run_OBJECTS) $(mn10300_run_LDADD) $(LIBS) -moxie/$(am__dirstamp): - @$(MKDIR_P) moxie - @: > moxie/$(am__dirstamp) moxie/run$(EXEEXT): $(moxie_run_OBJECTS) $(moxie_run_DEPENDENCIES) $(EXTRA_moxie_run_DEPENDENCIES) moxie/$(am__dirstamp) @rm -f moxie/run$(EXEEXT) @@ -5045,6 +5073,13 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_mn10300_TRUE@ -n engine.c -e mn10300/engine.c \ @SIM_ENABLE_ARCH_mn10300_TRUE@ -n irun.c -r mn10300/irun.c @SIM_ENABLE_ARCH_mn10300_TRUE@ $(AM_V_at)touch $@ +@SIM_ENABLE_ARCH_moxie_TRUE@$(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_LIBADD): moxie/hw-config.h + +@SIM_ENABLE_ARCH_moxie_TRUE@moxie/%.o: moxie/%.c +@SIM_ENABLE_ARCH_moxie_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + +@SIM_ENABLE_ARCH_moxie_TRUE@moxie/%.o: common/%.c +@SIM_ENABLE_ARCH_moxie_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_moxie_TRUE@moxie/moxie-gdb.dtb: @MAINT@ moxie/moxie-gdb.dts moxie/$(am__dirstamp) @SIM_ENABLE_ARCH_moxie_TRUE@ $(AM_V_GEN) \ diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in index dfc37c05427..d79426631ac 100644 --- a/sim/moxie/Makefile.in +++ b/sim/moxie/Makefile.in @@ -17,10 +17,7 @@ ## COMMON_PRE_CONFIG_FRAG -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - interp.o \ - sim-resume.o +SIM_LIBSIM = SIM_EXTRA_CFLAGS = -DDTB="\"$(dtbdir)/moxie-gdb.dtb\"" diff --git a/sim/moxie/local.mk b/sim/moxie/local.mk index 2e0d586076e..813bdc89533 100644 --- a/sim/moxie/local.mk +++ b/sim/moxie/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 . +%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)) \ + %D%/interp.o \ + %D%/modules.o \ + %D%/sim-resume.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 \ -- 2.30.2