diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-12-26 21:19:35 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-10 01:15:24 -0500 |
| commit | 3f6c63ac49a994bb90732bc892cb630e163ad364 (patch) | |
| tree | 53de6ae7acccb36b1b22f8fab6197070b6a70d21 /sim/erc32 | |
| parent | faf177dff014660285856c2c6bada1595f7268ba (diff) | |
| download | gdb-3f6c63ac49a994bb90732bc892cb630e163ad364.zip gdb-3f6c63ac49a994bb90732bc892cb630e163ad364.tar.gz gdb-3f6c63ac49a994bb90732bc892cb630e163ad364.tar.bz2 | |
sim: erc32: 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.
Diffstat (limited to 'sim/erc32')
| -rw-r--r-- | sim/erc32/Makefile.in | 5 | ||||
| -rw-r--r-- | sim/erc32/local.mk | 24 |
2 files changed, 23 insertions, 6 deletions
diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index d10eb0e..252427d 100644 --- a/sim/erc32/Makefile.in +++ b/sim/erc32/Makefile.in @@ -18,10 +18,11 @@ ## COMMON_PRE_CONFIG_FRAG +SIM_LIBSIM = +SIM_RUN_OBJS = + READLINE_SRC = $(srcroot)/readline/readline -SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o -SIM_RUN_OBJS = sis.o SIM_EXTRA_CFLAGS = $(READLINE_CFLAGS) # UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to diff --git a/sim/erc32/local.mk b/sim/erc32/local.mk index 65935fe..7c95128 100644 --- a/sim/erc32/local.mk +++ b/sim/erc32/local.mk @@ -17,6 +17,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) \ + %D%/erc32.o \ + %D%/exec.o \ + %D%/float.o \ + %D%/func.o \ + %D%/help.o \ + %D%/interf.o \ + %D%/modules.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%/sis.o \ @@ -26,10 +46,6 @@ %D%/sis$(EXEEXT): %D%/run$(EXEEXT) $(AM_V_GEN)ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@ -## Helper targets for running make from the top-level due to run's sis.o. -%D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS) - $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - noinst_PROGRAMS += %D%/run %D%/sis %C%docdir = $(docdir)/%C% |