[PATCH 29/83] sim: pru: move libsim.a creation to top-level
Mike Frysinger
vapier@gentoo.org
Tue Jan 3 07:55:11 GMT 2023
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.
---
sim/Makefile.in | 88 +++++++++++++++++++++++++++++++--------------
sim/pru/Makefile.in | 5 +--
sim/pru/local.mk | 18 ++++++++++
3 files changed, 80 insertions(+), 31 deletions(-)
diff --git a/sim/pru/Makefile.in b/sim/pru/Makefile.in
index b81d0967e7a0..9b2f2f0498aa 100644
--- a/sim/pru/Makefile.in
+++ b/sim/pru/Makefile.in
@@ -19,9 +19,6 @@
## COMMON_PRE_CONFIG_FRAG
-SIM_OBJS = \
- $(SIM_NEW_COMMON_OBJS) \
- interp.o \
- sim-resume.o
+SIM_LIBSIM =
## COMMON_POST_CONFIG_FRAG
diff --git a/sim/pru/local.mk b/sim/pru/local.mk
index 5992f0ce1613..0c3018cbeb2d 100644
--- a/sim/pru/local.mk
+++ b/sim/pru/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) \
+ $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \
+ $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \
+ %D%/interp.o \
+ %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 \
--
2.39.0
More information about the Gdb-patches
mailing list