diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-12-26 21:10:34 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-10 01:15:24 -0500 |
| commit | eaa678ecc30ed6632d1315e99951eed741649d67 (patch) | |
| tree | 4205310fa31a262537057a9731ac4d027b22fe7e /sim/cris | |
| parent | 2cbdcc340ae3c3926eb414394c890a3b688bcc3c (diff) | |
| download | gdb-eaa678ecc30ed6632d1315e99951eed741649d67.zip gdb-eaa678ecc30ed6632d1315e99951eed741649d67.tar.gz gdb-eaa678ecc30ed6632d1315e99951eed741649d67.tar.bz2 | |
sim: cris: 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/cris')
| -rw-r--r-- | sim/cris/Makefile.in | 12 | ||||
| -rw-r--r-- | sim/cris/local.mk | 37 |
2 files changed, 38 insertions, 11 deletions
diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in index 0a045ca..142825f 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -21,16 +21,6 @@ arch = cris -CRISV10F_OBJS = crisv10f.o cpuv10.o decodev10.o modelv10.o mloopv10f.o -CRISV32F_OBJS = crisv32f.o cpuv32.o decodev32.o modelv32.o mloopv32f.o - -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - cgen-utils.o cgen-trace.o cgen-scache.o \ - cgen-run.o \ - sim-if.o arch.o \ - $(CRISV10F_OBJS) \ - $(CRISV32F_OBJS) \ - traps.o +SIM_LIBSIM = ## COMMON_POST_CONFIG_FRAG diff --git a/sim/cris/local.mk b/sim/cris/local.mk index d55e7b8..912ca12 100644 --- a/sim/cris/local.mk +++ b/sim/cris/local.mk @@ -16,6 +16,43 @@ ## 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) \ + $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \ + $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \ + $(patsubst %,%D%/dv-%.o,$(%C%_SIM_EXTRA_HW_DEVICES)) \ + %D%/modules.o \ + \ + %D%/cgen-run.o \ + %D%/cgen-scache.o \ + %D%/cgen-trace.o \ + %D%/cgen-utils.o \ + \ + %D%/arch.o \ + %D%/crisv10f.o \ + %D%/cpuv10.o \ + %D%/decodev10.o \ + %D%/modelv10.o \ + %D%/mloopv10f.o \ + %D%/crisv32f.o \ + %D%/cpuv32.o \ + %D%/decodev32.o \ + %D%/modelv32.o \ + %D%/mloopv32f.o \ + \ + %D%/sim-if.o \ + %D%/traps.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%/nrun.o \ |