aboutsummaryrefslogtreecommitdiff
path: root/sim/iq2000
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-12-26 21:48:51 -0500
committerMike Frysinger <vapier@gentoo.org>2023-01-10 01:15:24 -0500
commit1486f22b135b696369eff57259f6ea56d77a60de (patch)
tree4094f7ee5e32e0bad0a953757a8d6b7b4cffa823 /sim/iq2000
parent3e9c9407ff09ec19d5d7be878ed17ed238938fc9 (diff)
downloadgdb-1486f22b135b696369eff57259f6ea56d77a60de.zip
gdb-1486f22b135b696369eff57259f6ea56d77a60de.tar.gz
gdb-1486f22b135b696369eff57259f6ea56d77a60de.tar.bz2
sim: iq2000: 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/iq2000')
-rw-r--r--sim/iq2000/Makefile.in9
-rw-r--r--sim/iq2000/local.mk31
2 files changed, 32 insertions, 8 deletions
diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in
index c0fb650..b4679a4 100644
--- a/sim/iq2000/Makefile.in
+++ b/sim/iq2000/Makefile.in
@@ -17,14 +17,7 @@
## COMMON_PRE_CONFIG_FRAG
-IQ2000_OBJS = iq2000.o cpu.o decode.o sem.o model.o mloop.o
-
-SIM_OBJS = \
- $(SIM_NEW_COMMON_OBJS) \
- cgen-utils.o cgen-trace.o cgen-scache.o \
- cgen-run.o \
- sim-if.o arch.o \
- $(IQ2000_OBJS)
+SIM_LIBSIM =
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/iq2000/local.mk b/sim/iq2000/local.mk
index 4113b4b..98385a0 100644
--- a/sim/iq2000/local.mk
+++ b/sim/iq2000/local.mk
@@ -16,6 +16,37 @@
## 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)) \
+ %D%/modules.o \
+ \
+ %D%/cgen-run.o \
+ %D%/cgen-scache.o \
+ %D%/cgen-trace.o \
+ %D%/cgen-utils.o \
+ \
+ %D%/arch.o \
+ %D%/cpu.o \
+ %D%/decode.o \
+ %D%/iq2000.o \
+ %D%/sem.o \
+ %D%/mloop.o \
+ %D%/model.o \
+ \
+ %D%/sim-if.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 \