diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-11-03 18:19:13 +0700 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-11-05 20:00:56 +0700 |
| commit | c0c25232da12f3985041cded1bb7e761d4d0cd1e (patch) | |
| tree | b1886508998af5eeda176ae1bedc71a016cf89a7 /sim/erc32 | |
| parent | 59d8576e4ff7e6467fab3ea894baa72c8400e22a (diff) | |
| download | binutils-gdb-c0c25232da12f3985041cded1bb7e761d4d0cd1e.tar.gz | |
sim: run: move linking into top-level
Automake will run each subdir individually before moving on to the next
one. This means that the linking phase, a single threaded process, will
not run in parallel with anything else. When we have to link ~32 ports,
that's 32 link steps that don't take advantage of parallel systems. On
my really old 4-core system, this cuts a multi-target build from ~60 sec
to ~30 sec. We eventually want to move all compile+link steps to this
common dir anyways, so might as well move linking now for a nice speedup.
We use noinst_PROGRAMS instead of bin_PROGRAMS because we're taking care
of the install ourselves rather than letting automake process it.
Diffstat (limited to 'sim/erc32')
| -rw-r--r-- | sim/erc32/Makefile.in | 9 | ||||
| -rw-r--r-- | sim/erc32/local.mk | 17 |
2 files changed, 17 insertions, 9 deletions
diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index eef81d9dcd6..6675fceccf3 100644 --- a/sim/erc32/Makefile.in +++ b/sim/erc32/Makefile.in @@ -24,7 +24,6 @@ SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o SIM_RUN_OBJS = sis.o SIM_EXTRA_CFLAGS = $(READLINE_CFLAGS) SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -SIM_EXTRA_CLEAN = clean-sis # UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to # CFLAGS if faster (infinite) UART speed is desired. Might affect the @@ -32,11 +31,3 @@ SIM_EXTRA_CLEAN = clean-sis SIM_EXTRA_CFLAGS += -DFAST_UART -I$(srcroot) ## COMMON_POST_CONFIG_FRAG - -all: sis$(EXEEXT) -sis$(EXEEXT): run$(EXEEXT) - $(SILENCE) rm -f $@ - $(ECHO_GEN) ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@ - -clean-sis: - rm -f sis diff --git a/sim/erc32/local.mk b/sim/erc32/local.mk index 36baeb96614..d73bc5b4bfe 100644 --- a/sim/erc32/local.mk +++ b/sim/erc32/local.mk @@ -1,6 +1,8 @@ ## See sim/Makefile.am ## ## Copyright (C) 1993-2022 Free Software Foundation, Inc. +## Written by Cygnus Support +## Modified by J.Gaisler ESA/ESTEC ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -15,6 +17,21 @@ ## 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%_run_SOURCES = +%C%_run_LDADD = \ + %D%/sis.o \ + %D%/libsim.a \ + $(SIM_COMMON_LIBS) $(READLINE_LIB) $(TERMCAP_LIB) + +%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) -C $(@D) $(@F) + +noinst_PROGRAMS += %D%/run %D%/sis + %C%docdir = $(docdir)/%C% %C%doc_DATA = %D%/README.erc32 %D%/README.gdb %D%/README.sis |