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/ppc | |
| 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/ppc')
| -rw-r--r-- | sim/ppc/Makefile.in | 16 | ||||
| -rw-r--r-- | sim/ppc/local.mk | 15 |
2 files changed, 17 insertions, 14 deletions
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index d7b9df0819f..cb1a25b4b5e 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -37,10 +37,6 @@ include ../arch-subdir.mk prefix = @prefix@ exec_prefix = @exec_prefix@ -bindir = @bindir@ -libdir = @libdir@ -tooldir = $(libdir)/$(target_alias) - datarootdir = @datarootdir@ datadir = @datadir@ mandir = @mandir@ @@ -135,7 +131,7 @@ BFD_LIB = ../../bfd/libbfd.la TARGETLIB = libsim.a -all: run$(EXEEXT) $(TARGETLIB) $(GDB_OBJ) +all: main.o $(TARGETLIB) $(GDB_OBJ) .c.o: $(ECHO_CC) $(CC) -c $(STD_CFLAGS) $< @@ -518,14 +514,6 @@ PACKAGE_SRC = pk_disklabel.c PACKAGE_OBJ = $(PACKAGE_SRC:.c=.o) -psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) - $(ECHO_CCLD) $(LIBTOOL) $(AM_V_lt) --tag=CC --mode=link \ - $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBIBERTY_LIB) $(LIBS) - -run$(EXEEXT): psim$(EXEEXT) - $(SILENCE) rm -f $@ - $(ECHO_GEN) ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@ - $(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-defines $(LIB_OBJ) $(GDB_OBJ) $(ECHO_AR) $(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ) $(ECHO_RANLIB) $(RANLIB) $(TARGETLIB) @@ -811,7 +799,7 @@ TAGS: $(BUILT_SRC) etags $(srcdir)/*.h $(srcdir)/*.c $(BUILT_SRC) clean mostlyclean: - rm -f tmp-* *.[oasi] core psim$(EXEEXT) run$(EXEEXT) igen dgen $(BUILT_SRC_WO_CONFIG) + rm -f tmp-* *.[oasi] core igen dgen $(BUILT_SRC_WO_CONFIG) distclean realclean: clean rm -f TAGS Makefile config.cache config.status config.h defines.h stamp-h config.log diff --git a/sim/ppc/local.mk b/sim/ppc/local.mk index 03e54fbe083..19a8a89ba47 100644 --- a/sim/ppc/local.mk +++ b/sim/ppc/local.mk @@ -15,5 +15,20 @@ ## 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%/main.o \ + %D%/libsim.a \ + $(SIM_COMMON_LIBS) + +%D%/psim$(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%/psim + %C%docdir = $(docdir)/%C% %C%doc_DATA = %D%/BUGS %D%/INSTALL %D%/README %D%/RUN |