From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id C14A73858D32; Sun, 15 Jan 2023 02:01:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C14A73858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673748117; bh=wI0QI1R7v5BrHCrTbPa3mshVfj9GOe8Y7Vcm7I+LVbc=; h=From:To:Subject:Date:From; b=QyLbHAz3l4kCP6NDRpBuK5FTqPGImFsyY+ebxaZkdjmJzUkUTwyvnakD4C53C4NeZ SHGualMqq/NC+/u1zJkR/wb+DnwnRgDeVq04oTSt79JQ7d99bQHkbMf7u34pf7IqKY lBDwrN5dCnJTcLGJs54z/1w3Cjw89nTcdA9uNwqc= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: common: simplify modules.c deps X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 72be276fffe304a478ecadad34bb89fe33cdf052 X-Git-Newrev: 1b907fc09fc28c40ca59d90886227fefbb34c62f Message-Id: <20230115020157.C14A73858D32@sourceware.org> Date: Sun, 15 Jan 2023 02:01:57 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1b907fc09fc2= 8c40ca59d90886227fefbb34c62f commit 1b907fc09fc28c40ca59d90886227fefbb34c62f Author: Mike Frysinger Date: Mon Jan 2 00:11:00 2023 -0500 sim: common: simplify modules.c deps =20 Now that all ports (other than ppc) build in the top-level, we don't need to expand all the modules.c targets as a recursive dep. Each port depends on their respective file now, and the ppc port doesn't use it at all. Diff: --- sim/Makefile.in | 8 +++----- sim/common/local.mk | 5 +---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 5dbfbeffcc6..1ac885f6d1f 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1825,8 +1825,8 @@ DISTCLEANFILES =3D $(am__append_81) MOSTLYCLEANFILES =3D core $(SIM_ENABLED_ARCHES:%=3D%/*.o) \ $(SIM_ENABLED_ARCHES:%=3D%/hw-config.h) \ $(SIM_ENABLED_ARCHES:%=3D%/stamp-hw) \ - $(common_GEN_MODULES_C_TARGETS) $(patsubst \ - %,%/stamp-modules,$(SIM_ENABLED_ARCHES)) $(am__append_5) \ + $(SIM_ENABLED_ARCHES:%=3D%/modules.c) \ + $(SIM_ENABLED_ARCHES:%=3D%/stamp-modules) $(am__append_5) \ site-sim-config.exp testrun.log testrun.sum $(am__append_17) \ $(am__append_22) $(am__append_27) $(am__append_32) \ $(am__append_42) $(am__append_50) $(am__append_54) \ @@ -1847,8 +1847,7 @@ AM_CPPFLAGS_FOR_BUILD =3D -I$(srcroot)/include $(SIM_= HW_CFLAGS) \ $(SIM_INLINE) -I$(srcdir)/common COMPILE_FOR_BUILD =3D $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_= FOR_BUILD) $(CFLAGS_FOR_BUILD) LINK_FOR_BUILD =3D $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD= ) -o $@ -SIM_ALL_RECURSIVE_DEPS =3D $(common_GEN_MODULES_C_TARGETS) \ - $(am__append_94) +SIM_ALL_RECURSIVE_DEPS =3D $(am__append_94) SIM_INSTALL_DATA_LOCAL_DEPS =3D=20 SIM_INSTALL_EXEC_LOCAL_DEPS =3D $(am__append_35) SIM_UNINSTALL_LOCAL_DEPS =3D $(am__append_36) @@ -1896,7 +1895,6 @@ GEN_MODULES_C_SRCS =3D \ $(patsubst %.o,$(srcdir)/%.c,$($(am_arch_d)_libsim_a_OBJECTS) $($(am_arc= h_d)_libsim_a_LIBADD)) \ $(filter-out %.o,$(patsubst $(@D)/%.o,$(srcdir)/common/%.c,$($(am_arch_d= )_libsim_a_LIBADD)))) =20 -common_GEN_MODULES_C_TARGETS =3D $(patsubst %,%/modules.c,$(filter-out ppc= ,$(SIM_ENABLED_ARCHES))) LIBIBERTY_LIB =3D ../libiberty/libiberty.a BFD_LIB =3D ../bfd/libbfd.la OPCODES_LIB =3D ../opcodes/libopcodes.la diff --git a/sim/common/local.mk b/sim/common/local.mk index f6eee5cc91e..89843ead03b 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -160,10 +160,7 @@ GEN_MODULES_C_SRCS =3D \ .PRECIOUS: %/stamp-modules =20 ## NB: The ppc port doesn't currently utilize the modules API, so skip it. -%C%_GEN_MODULES_C_TARGETS =3D $(patsubst %,%/modules.c,$(filter-out ppc,$(= SIM_ENABLED_ARCHES))) -MOSTLYCLEANFILES +=3D $(%C%_GEN_MODULES_C_TARGETS) $(patsubst %,%/stamp-mo= dules,$(SIM_ENABLED_ARCHES)) -## TODO: Drop this once each port's local.mk:libsim.a depends on it themse= lf. -SIM_ALL_RECURSIVE_DEPS +=3D $(%C%_GEN_MODULES_C_TARGETS) +MOSTLYCLEANFILES +=3D $(SIM_ENABLED_ARCHES:%=3D%/modules.c) $(SIM_ENABLED_= ARCHES:%=3D%/stamp-modules) =20 LIBIBERTY_LIB =3D ../libiberty/libiberty.a BFD_LIB =3D ../bfd/libbfd.la