diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-12-26 21:54:30 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-10 01:15:24 -0500 |
| commit | ba3a8498992008d2bfa1ee184b256ec53d55a9a1 (patch) | |
| tree | 8b6cbcec73ff1f68b3d0002f5da70f9d983bb3fe /sim/m32c | |
| parent | 000f7bee9a522b9e05075ad05db0bc66ac2cc574 (diff) | |
| download | binutils-ba3a8498992008d2bfa1ee184b256ec53d55a9a1.zip binutils-ba3a8498992008d2bfa1ee184b256ec53d55a9a1.tar.gz binutils-ba3a8498992008d2bfa1ee184b256ec53d55a9a1.tar.bz2 | |
sim: m32c: 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/m32c')
| -rw-r--r-- | sim/m32c/Makefile.in | 16 | ||||
| -rw-r--r-- | sim/m32c/local.mk | 29 |
2 files changed, 27 insertions, 18 deletions
diff --git a/sim/m32c/Makefile.in b/sim/m32c/Makefile.in index 36ca59e..cbe0c91 100644 --- a/sim/m32c/Makefile.in +++ b/sim/m32c/Makefile.in @@ -22,19 +22,7 @@ SIM_EXTRA_CFLAGS = -DTIMER_A -SIM_RUN_OBJS = main.o - -SIM_OBJS = \ - gdb-if.o \ - int.o \ - load.o \ - mem.o \ - misc.o \ - reg.o \ - r8c.o \ - m32c.o \ - srcdest.o \ - syscalls.o \ - trace.o +SIM_LIBSIM = +SIM_RUN_OBJS = ## COMMON_POST_CONFIG_FRAG diff --git a/sim/m32c/local.mk b/sim/m32c/local.mk index 7590907..5633240 100644 --- a/sim/m32c/local.mk +++ b/sim/m32c/local.mk @@ -16,6 +16,31 @@ ## 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%/gdb-if.o \ + %D%/int.o \ + %D%/load.o \ + %D%/m32c.o \ + %D%/mem.o \ + %D%/misc.o \ + %D%/modules.o \ + %D%/r8c.o \ + %D%/reg.o \ + %D%/srcdest.o \ + %D%/syscalls.o \ + %D%/trace.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,10 +49,6 @@ 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%_BUILD_OUTPUTS = \ %D%/opc2c$(EXEEXT) \ %D%/m32c.c \ |