From dd719fa642c7ed651346cc34e5ef1c0e9502ba04 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 26 Dec 2022 22:29:53 -0500 Subject: [PATCH] sim: sh: 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 | 78 ++++++++++++++++++++++++++++++++-------------- sim/sh/Makefile.in | 5 +-- sim/sh/local.mk | 18 +++++++++++ 3 files changed, 74 insertions(+), 27 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 63ff2414c70..9c2ab99367b 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -318,16 +318,17 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_rl78_TRUE@am__append_122 = rl78/run @SIM_ENABLE_ARCH_rx_TRUE@am__append_123 = rx/libsim.a @SIM_ENABLE_ARCH_rx_TRUE@am__append_124 = rx/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_125 = sh/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_126 = \ +@SIM_ENABLE_ARCH_sh_TRUE@am__append_125 = sh/libsim.a +@SIM_ENABLE_ARCH_sh_TRUE@am__append_126 = sh/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_127 = \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/code.c \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/ppi.c -@SIM_ENABLE_ARCH_sh_TRUE@am__append_127 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_128 = sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_129 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_130 = v850/run -@SIM_ENABLE_ARCH_v850_TRUE@am__append_131 = \ +@SIM_ENABLE_ARCH_sh_TRUE@am__append_128 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_129 = sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_130 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_131 = v850/run +@SIM_ENABLE_ARCH_v850_TRUE@am__append_132 = \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/icache.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/idecode.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/semantics.h \ @@ -336,8 +337,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_132 = $(v850_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_v850_TRUE@am__append_133 = $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_134 = $(v850_BUILD_OUTPUTS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -843,6 +844,16 @@ rx_libsim_a_AR = $(AR) $(ARFLAGS) @SIM_ENABLE_ARCH_rx_TRUE@ rx/modules.o am_rx_libsim_a_OBJECTS = rx_libsim_a_OBJECTS = $(am_rx_libsim_a_OBJECTS) +sh_libsim_a_AR = $(AR) $(ARFLAGS) +@SIM_ENABLE_ARCH_sh_TRUE@sh_libsim_a_DEPENDENCIES = \ +@SIM_ENABLE_ARCH_sh_TRUE@ $(common_libcommon_a_OBJECTS) \ +@SIM_ENABLE_ARCH_sh_TRUE@ sh/interp.o $(patsubst \ +@SIM_ENABLE_ARCH_sh_TRUE@ %,sh/%,$(SIM_NEW_COMMON_OBJS)) \ +@SIM_ENABLE_ARCH_sh_TRUE@ $(patsubst \ +@SIM_ENABLE_ARCH_sh_TRUE@ %,sh/dv-%.o,$(SIM_HW_DEVICES)) \ +@SIM_ENABLE_ARCH_sh_TRUE@ sh/modules.o sh/table.o +am_sh_libsim_a_OBJECTS = +sh_libsim_a_OBJECTS = $(am_sh_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) \ @@ -1180,12 +1191,12 @@ SOURCES = $(aarch64_libsim_a_SOURCES) $(arm_libsim_a_SOURCES) \ $(moxie_libsim_a_SOURCES) $(msp430_libsim_a_SOURCES) \ $(or1k_libsim_a_SOURCES) $(pru_libsim_a_SOURCES) \ $(riscv_libsim_a_SOURCES) $(rl78_libsim_a_SOURCES) \ - $(rx_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 \ + $(rx_libsim_a_SOURCES) $(sh_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) \ @@ -1750,12 +1761,12 @@ noinst_LIBRARIES = common/libcommon.a $(am__append_5) $(am__append_8) \ $(am__append_86) $(am__append_91) $(am__append_101) \ $(am__append_107) $(am__append_109) $(am__append_111) \ $(am__append_117) $(am__append_119) $(am__append_121) \ - $(am__append_123) + $(am__append_123) $(am__append_125) 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_113) $(am__append_126) \ - $(am__append_131) + $(am__append_104) $(am__append_113) $(am__append_127) \ + $(am__append_132) CLEANFILES = common/version.c common/version.c-stamp \ testsuite/common/bits-gen testsuite/common/bits32m0.c \ testsuite/common/bits32m31.c testsuite/common/bits64m0.c \ @@ -1770,7 +1781,7 @@ MOSTLYCLEANFILES = core $(common_HW_CONFIG_H_TARGETS) $(patsubst \ $(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_115) \ - $(am__append_129) $(am__append_133) + $(am__append_130) $(am__append_134) AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \ @@ -1785,8 +1796,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_114) $(am__append_127) \ - $(am__append_132) + $(am__append_105) $(am__append_114) $(am__append_128) \ + $(am__append_133) SIM_INSTALL_DATA_LOCAL_DEPS = SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_43) SIM_UNINSTALL_LOCAL_DEPS = $(am__append_44) @@ -2807,6 +2818,15 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_rx_TRUE@rxdocdir = $(docdir)/rx @SIM_ENABLE_ARCH_rx_TRUE@rxdoc_DATA = rx/README.txt +@SIM_ENABLE_ARCH_sh_TRUE@sh_libsim_a_SOURCES = +@SIM_ENABLE_ARCH_sh_TRUE@sh_libsim_a_LIBADD = \ +@SIM_ENABLE_ARCH_sh_TRUE@ $(common_libcommon_a_OBJECTS) \ +@SIM_ENABLE_ARCH_sh_TRUE@ sh/interp.o \ +@SIM_ENABLE_ARCH_sh_TRUE@ $(patsubst %,sh/%,$(SIM_NEW_COMMON_OBJS)) \ +@SIM_ENABLE_ARCH_sh_TRUE@ $(patsubst %,sh/dv-%.o,$(SIM_HW_DEVICES)) \ +@SIM_ENABLE_ARCH_sh_TRUE@ sh/modules.o \ +@SIM_ENABLE_ARCH_sh_TRUE@ sh/table.o + @SIM_ENABLE_ARCH_sh_TRUE@sh_run_SOURCES = @SIM_ENABLE_ARCH_sh_TRUE@sh_run_LDADD = \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/nrun.o \ @@ -3340,6 +3360,14 @@ rx/libsim.a: $(rx_libsim_a_OBJECTS) $(rx_libsim_a_DEPENDENCIES) $(EXTRA_rx_libsi $(AM_V_at)-rm -f rx/libsim.a $(AM_V_AR)$(rx_libsim_a_AR) rx/libsim.a $(rx_libsim_a_OBJECTS) $(rx_libsim_a_LIBADD) $(AM_V_at)$(RANLIB) rx/libsim.a +sh/$(am__dirstamp): + @$(MKDIR_P) sh + @: > sh/$(am__dirstamp) + +sh/libsim.a: $(sh_libsim_a_OBJECTS) $(sh_libsim_a_DEPENDENCIES) $(EXTRA_sh_libsim_a_DEPENDENCIES) sh/$(am__dirstamp) + $(AM_V_at)-rm -f sh/libsim.a + $(AM_V_AR)$(sh_libsim_a_AR) sh/libsim.a $(sh_libsim_a_OBJECTS) $(sh_libsim_a_LIBADD) + $(AM_V_at)$(RANLIB) sh/libsim.a clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -3573,9 +3601,6 @@ rl78/run$(EXEEXT): $(rl78_run_OBJECTS) $(rl78_run_DEPENDENCIES) $(EXTRA_rl78_run rx/run$(EXEEXT): $(rx_run_OBJECTS) $(rx_run_DEPENDENCIES) $(EXTRA_rx_run_DEPENDENCIES) rx/$(am__dirstamp) @rm -f rx/run$(EXEEXT) $(AM_V_CCLD)$(LINK) $(rx_run_OBJECTS) $(rx_run_LDADD) $(LIBS) -sh/$(am__dirstamp): - @$(MKDIR_P) sh - @: > sh/$(am__dirstamp) sh/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) sh/$(DEPDIR) @: > sh/$(DEPDIR)/$(am__dirstamp) @@ -5361,6 +5386,13 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_rx_TRUE@rx/%.o: common/%.c @SIM_ENABLE_ARCH_rx_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_sh_TRUE@$(sh_libsim_a_OBJECTS) $(sh_libsim_a_LIBADD): sh/hw-config.h + +@SIM_ENABLE_ARCH_sh_TRUE@sh/%.o: sh/%.c +@SIM_ENABLE_ARCH_sh_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + +@SIM_ENABLE_ARCH_sh_TRUE@sh/%.o: common/%.c +@SIM_ENABLE_ARCH_sh_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_sh_TRUE@sh/modules.c: | $(sh_BUILD_OUTPUTS) # These rules are copied from automake, but tweaked to use FOR_BUILD variables. diff --git a/sim/sh/Makefile.in b/sim/sh/Makefile.in index fef187a07dd..ceb4878d285 100644 --- a/sim/sh/Makefile.in +++ b/sim/sh/Makefile.in @@ -17,9 +17,6 @@ ## COMMON_PRE_CONFIG_FRAG -SIM_OBJS = \ - interp.o \ - $(SIM_NEW_COMMON_OBJS) \ - table.o +SIM_LIBSIM = ## COMMON_POST_CONFIG_FRAG diff --git a/sim/sh/local.mk b/sim/sh/local.mk index c25ab536c68..b7c9e615725 100644 --- a/sim/sh/local.mk +++ b/sim/sh/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) \ + %D%/interp.o \ + $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \ + $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \ + %D%/modules.o \ + %D%/table.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