Commit Message
Mike Frysinger
Jan. 3, 2023, 7:54 a.m. UTC
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 | 212 ++++++++++++++++++++++++++--------------- sim/iq2000/Makefile.in | 9 +- sim/iq2000/local.mk | 31 ++++++ 3 files changed, 165 insertions(+), 87 deletions(-)
diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in index c0fb6507ca69..b4679a484391 100644 --- a/sim/iq2000/Makefile.in +++ b/sim/iq2000/Makefile.in @@ -17,14 +17,7 @@ ## COMMON_PRE_CONFIG_FRAG -IQ2000_OBJS = iq2000.o cpu.o decode.o sem.o model.o mloop.o - -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - cgen-utils.o cgen-trace.o cgen-scache.o \ - cgen-run.o \ - sim-if.o arch.o \ - $(IQ2000_OBJS) +SIM_LIBSIM = ## COMMON_POST_CONFIG_FRAG diff --git a/sim/iq2000/local.mk b/sim/iq2000/local.mk index 4113b4bc2f39..98385a07f580 100644 --- a/sim/iq2000/local.mk +++ b/sim/iq2000/local.mk @@ -16,6 +16,37 @@ ## 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)) \ + %D%/modules.o \ + \ + %D%/cgen-run.o \ + %D%/cgen-scache.o \ + %D%/cgen-trace.o \ + %D%/cgen-utils.o \ + \ + %D%/arch.o \ + %D%/cpu.o \ + %D%/decode.o \ + %D%/iq2000.o \ + %D%/sem.o \ + %D%/mloop.o \ + %D%/model.o \ + \ + %D%/sim-if.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 \