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 | 87 ++++++++++++++++++++++++++++++------------- sim/riscv/Makefile.in | 7 +--- sim/riscv/local.mk | 20 ++++++++++ 3 files changed, 83 insertions(+), 31 deletions(-)
diff --git a/sim/riscv/Makefile.in b/sim/riscv/Makefile.in index 357d2abf9401..d85f078f250b 100644 --- a/sim/riscv/Makefile.in +++ b/sim/riscv/Makefile.in @@ -17,12 +17,7 @@ ## COMMON_PRE_CONFIG_FRAG -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - sim-resume.o \ - interp.o \ - machs.o \ - sim-main.o +SIM_LIBSIM = SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=@SIM_RISCV_BITSIZE@ diff --git a/sim/riscv/local.mk b/sim/riscv/local.mk index 1b44779cf272..6f03fc3d0346 100644 --- a/sim/riscv/local.mk +++ b/sim/riscv/local.mk @@ -16,6 +16,26 @@ ## 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%/interp.o \ + %D%/machs.o \ + %D%/modules.o \ + %D%/sim-main.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 \