Commit Message
Mike Frysinger
Jan. 3, 2023, 7:55 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 | 203 +++++++++++++++++++++++++++++-------------- sim/m32r/Makefile.in | 14 +-- sim/m32r/local.mk | 46 ++++++++++ 3 files changed, 186 insertions(+), 77 deletions(-)
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in index 644d8de7dd1d..08cda449ca16 100644 --- a/sim/m32r/Makefile.in +++ b/sim/m32r/Makefile.in @@ -21,19 +21,7 @@ arch = m32r -M32R_OBJS = m32r.o cpu.o decode.o sem.o model.o mloop.o -M32RX_OBJS = m32rx.o cpux.o decodex.o modelx.o mloopx.o -M32R2_OBJS = m32r2.o cpu2.o decode2.o model2.o mloop2.o - -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - cgen-utils.o cgen-trace.o cgen-scache.o \ - cgen-run.o \ - sim-if.o arch.o \ - $(M32R_OBJS) \ - $(M32RX_OBJS) \ - $(M32R2_OBJS) \ - traps.o +SIM_LIBSIM = # Some modules don't build cleanly yet. cpu.o cpu2.o cpux.o m32r.o m32r2.o m32rx.o mloop.o mloop2.o mloopx.o sem.o sim-if.o traps.o: SIM_WERROR_CFLAGS = diff --git a/sim/m32r/local.mk b/sim/m32r/local.mk index 9814ae5c6c16..afecaf6c8bce 100644 --- a/sim/m32r/local.mk +++ b/sim/m32r/local.mk @@ -16,6 +16,52 @@ ## 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%/m32r.o \ + %D%/cpu.o \ + %D%/decode.o \ + %D%/sem.o \ + %D%/model.o \ + %D%/mloop.o \ + \ + %D%/m32rx.o \ + %D%/cpux.o \ + %D%/decodex.o \ + %D%/modelx.o \ + %D%/mloopx.o \ + \ + %D%/m32r2.o \ + %D%/cpu2.o \ + %D%/decode2.o \ + %D%/model2.o \ + %D%/mloop2.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 \