aboutsummaryrefslogtreecommitdiff
path: root/sim/mcore
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-12-26 22:01:29 -0500
committerMike Frysinger <vapier@gentoo.org>2023-01-10 01:15:25 -0500
commitdfceaa0dc36567a27d904af60c9c14d30eaa4842 (patch)
tree04858f17f2b61f87e9530bd3a4f867a5d36b11e1 /sim/mcore
parentccb680718a351c5854046126d8ad66278ec8c457 (diff)
downloadgdb-dfceaa0dc36567a27d904af60c9c14d30eaa4842.zip
gdb-dfceaa0dc36567a27d904af60c9c14d30eaa4842.tar.gz
gdb-dfceaa0dc36567a27d904af60c9c14d30eaa4842.tar.bz2
sim: mcore: 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/mcore')
-rw-r--r--sim/mcore/Makefile.in5
-rw-r--r--sim/mcore/local.mk18
2 files changed, 19 insertions, 4 deletions
diff --git a/sim/mcore/Makefile.in b/sim/mcore/Makefile.in
index 4f9272a..502e8a4 100644
--- a/sim/mcore/Makefile.in
+++ b/sim/mcore/Makefile.in
@@ -17,9 +17,6 @@
## COMMON_PRE_CONFIG_FRAG
-SIM_OBJS = \
- interp.o \
- $(SIM_NEW_COMMON_OBJS) \
- sim-resume.o
+SIM_LIBSIM =
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/mcore/local.mk b/sim/mcore/local.mk
index c9fc789..94abebc 100644
--- a/sim/mcore/local.mk
+++ b/sim/mcore/local.mk
@@ -16,6 +16,24 @@
## 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%/interp.o \
+ $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \
+ $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \
+ %D%/modules.o \
+ %D%/sim-resume.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 \