From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 6A8783858407; Tue, 10 Jan 2023 06:27:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6A8783858407 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673332054; bh=Wo9EGo5Z5icdW4lpM2Pf9gSmAX5ZlvIM1VDS1LQ02NM=; h=From:To:Subject:Date:From; b=LaVoI8vtamp4oiR6onZFTyVOVVVwwxwQfasFyVRUNKOxaJBbcXmmUI4IdNYTLZ/Uk p3uDO/+D8BIMmSbUjSILkrBCryQ6wHzlgvvKk+JbZNdwUBvtEHVPTA5ABvgZYsmzzL Ru2z1TtFul9Fij4L38P8UWyJNUkDEJrPq8L7sNwA= 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: moxie: move arch-specific file compilation to top-level X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 63a9d59e884e18d02ca15abc1149fd14b4b144cd X-Git-Newrev: ae0411a4858e7e55d2f31dde5a66cdaf9d463a26 Message-Id: <20230110062734.6A8783858407@sourceware.org> Date: Tue, 10 Jan 2023 06:27:34 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dae0411a4858e= 7e55d2f31dde5a66cdaf9d463a26 commit ae0411a4858e7e55d2f31dde5a66cdaf9d463a26 Author: Mike Frysinger Date: Sun Jan 1 14:19:54 2023 -0500 sim: moxie: move arch-specific file compilation to top-level =20 The arch-specific flags are only used by the arch-specific modules, not the common/ files, so we can delete them too. Diff: --- sim/Makefile.in | 4 +--- sim/moxie/Makefile.in | 3 --- sim/moxie/local.mk | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 90f1449ce05..ab68081e49b 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2738,6 +2738,7 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_IGEN_INSN =3D $(srcdir)/mn10300/mn10= 300.igen @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_IGEN_INSN_INC =3D mn10300/am33.igen = mn10300/am33-2.igen @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_IGEN_DC =3D $(srcdir)/mn10300/mn1030= 0.dc +@SIM_ENABLE_ARCH_moxie_TRUE@AM_CPPFLAGS_moxie =3D -DDTB=3D"\"$(dtbdir)/mox= ie-gdb.dtb\"" @SIM_ENABLE_ARCH_moxie_TRUE@moxie_libsim_a_SOURCES =3D=20 @SIM_ENABLE_ARCH_moxie_TRUE@moxie_libsim_a_LIBADD =3D \ @SIM_ENABLE_ARCH_moxie_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -5334,9 +5335,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_mn10300_TRUE@ $(AM_V_at)touch $@ @SIM_ENABLE_ARCH_moxie_TRUE@$(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_LIB= ADD): moxie/hw-config.h =20 -@SIM_ENABLE_ARCH_moxie_TRUE@moxie/%.o: moxie/%.c -@SIM_ENABLE_ARCH_moxie_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(= @F) - @SIM_ENABLE_ARCH_moxie_TRUE@moxie/%.o: common/%.c @SIM_ENABLE_ARCH_moxie_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(= @F) =20 diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in index fd9beedbf1d..0067fabbe5c 100644 --- a/sim/moxie/Makefile.in +++ b/sim/moxie/Makefile.in @@ -16,7 +16,4 @@ # along with this program. If not, see . =20 ## COMMON_PRE_CONFIG_FRAG - -SIM_EXTRA_CFLAGS =3D -DDTB=3D"\"$(dtbdir)/moxie-gdb.dtb\"" - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/moxie/local.mk b/sim/moxie/local.mk index 813bdc89533..b75f0a9a8e3 100644 --- a/sim/moxie/local.mk +++ b/sim/moxie/local.mk @@ -16,6 +16,8 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . =20 +AM_CPPFLAGS_%C% =3D -DDTB=3D"\"$(dtbdir)/moxie-gdb.dtb\"" + %C%_libsim_a_SOURCES =3D %C%_libsim_a_LIBADD =3D \ $(common_libcommon_a_OBJECTS) \ @@ -28,9 +30,6 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-co= nfig.h =20 noinst_LIBRARIES +=3D %D%/libsim.a =20 -%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)