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 | 129 ++++++++++++++++++++++++++++------------ sim/mn10300/Makefile.in | 8 +-- sim/mn10300/local.mk | 27 +++++++++ 3 files changed, 118 insertions(+), 46 deletions(-)
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in index a96cb56a50d2..511d6b5824b7 100644 --- a/sim/mn10300/Makefile.in +++ b/sim/mn10300/Makefile.in @@ -19,13 +19,7 @@ arch = mn10300 -MN10300_OBJS = \ - itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \ - $(SIM_NEW_COMMON_OBJS) \ - op_utils.o \ - sim-resume.o - -SIM_OBJS = $(MN10300_OBJS) interp.o +SIM_LIBSIM = # List of extra flags to always pass to $(CC). SIM_EXTRA_CFLAGS = \ diff --git a/sim/mn10300/local.mk b/sim/mn10300/local.mk index d24e6b8d0405..06b42087699a 100644 --- a/sim/mn10300/local.mk +++ b/sim/mn10300/local.mk @@ -16,6 +16,33 @@ ## 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) \ + %D%/itable.o \ + %D%/semantics.o \ + %D%/idecode.o \ + %D%/icache.o \ + %D%/engine.o \ + %D%/irun.o \ + %D%/support.o \ + $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \ + $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \ + $(patsubst %,%D%/dv-%.o,$(%C%_SIM_EXTRA_HW_DEVICES)) \ + %D%/interp.o \ + %D%/modules.o \ + %D%/op_utils.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 \