diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-12-26 22:28:46 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-10 01:15:26 -0500 |
| commit | 15538f651179053854b69e3eab8c31f2d813be7f (patch) | |
| tree | f9765b1a94607a1e5794ec7dda7b026b6f57394a /sim/rx | |
| parent | 91a335f9fd982cfd3b9f9318a1086f715a048d8b (diff) | |
| download | gdb-15538f651179053854b69e3eab8c31f2d813be7f.zip gdb-15538f651179053854b69e3eab8c31f2d813be7f.tar.gz gdb-15538f651179053854b69e3eab8c31f2d813be7f.tar.bz2 | |
sim: rx: 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/rx')
| -rw-r--r-- | sim/rx/Makefile.in | 15 | ||||
| -rw-r--r-- | sim/rx/local.mk | 28 |
2 files changed, 26 insertions, 17 deletions
diff --git a/sim/rx/Makefile.in b/sim/rx/Makefile.in index 28d13be..c418da2 100644 --- a/sim/rx/Makefile.in +++ b/sim/rx/Makefile.in @@ -22,18 +22,7 @@ SIM_EXTRA_CFLAGS = @SIM_RX_CYCLE_ACCURATE_FLAGS@ -SIM_RUN_OBJS = main.o - -SIM_OBJS = \ - fpu.o \ - load.o \ - mem.o \ - misc.o \ - reg.o \ - rx.o \ - syscalls.o \ - trace.o \ - gdb-if.o \ - err.o +SIM_LIBSIM = +SIM_RUN_OBJS = ## COMMON_POST_CONFIG_FRAG diff --git a/sim/rx/local.mk b/sim/rx/local.mk index 00978e9..c23ac4f 100644 --- a/sim/rx/local.mk +++ b/sim/rx/local.mk @@ -16,6 +16,30 @@ ## 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%/fpu.o \ + %D%/load.o \ + %D%/mem.o \ + %D%/misc.o \ + %D%/reg.o \ + %D%/rx.o \ + %D%/syscalls.o \ + %D%/trace.o \ + %D%/gdb-if.o \ + %D%/err.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%/main.o \ @@ -24,9 +48,5 @@ noinst_PROGRAMS += %D%/run -## Helper targets for running make from the top-level due to run's main.o. -%D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS) - $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - %C%docdir = $(docdir)/%C% %C%doc_DATA = %D%/README.txt |