From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id E12493858404; Tue, 10 Jan 2023 06:26:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E12493858404 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673332018; bh=phUE5QSH2udML2BPYLf673kWJdi1ZGkUkXINBEdDvgE=; h=From:To:Subject:Date:From; b=AcEEEdGqTc/Roq9CSwJzOBf6gNa9N9IV35Tdr2Ou68ztQ0bn6WY2VpmMSmMwknMw4 4AIImEGitZwRLhL/WWt+Ncd/YTvVS9QclvJs4LPQDi686qB7sYQLlZl/46KufQFXeB ZuZMZNoDN8DF/v0ZLIjxXN+byzP8uLlKPdTjBPS0= 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: m32c: 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: 2d3b0c959d870f5b4c7c8fb39bf19039509ee627 X-Git-Newrev: cd7aa21771c75387148d52e6bbc6adfd911db10e Message-Id: <20230110062658.E12493858404@sourceware.org> Date: Tue, 10 Jan 2023 06:26:58 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dcd7aa21771c7= 5387148d52e6bbc6adfd911db10e commit cd7aa21771c75387148d52e6bbc6adfd911db10e Author: Mike Frysinger Date: Sun Jan 1 14:12:55 2023 -0500 sim: m32c: 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/m32c/Makefile.in | 3 --- sim/m32c/local.mk | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 51e54234dbd..7f35e2abecb 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2425,6 +2425,7 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_lm32_TRUE@ lm32/mloop.c \ @SIM_ENABLE_ARCH_lm32_TRUE@ lm32/stamp-mloop =20 +@SIM_ENABLE_ARCH_m32c_TRUE@AM_CPPFLAGS_m32c =3D -DTIMER_A @SIM_ENABLE_ARCH_m32c_TRUE@m32c_libsim_a_SOURCES =3D=20 @SIM_ENABLE_ARCH_m32c_TRUE@m32c_libsim_a_LIBADD =3D \ @SIM_ENABLE_ARCH_m32c_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -4969,9 +4970,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_lm32_TRUE@lm32/cpu.h lm32/sem.c lm32/sem-switch.c lm32/mo= del.c lm32/decode.c lm32/decode.h: @CGEN_MAINT@ lm32/cgen-cpu-decode @SIM_ENABLE_ARCH_m32c_TRUE@$(m32c_libsim_a_OBJECTS) $(m32c_libsim_a_LIBADD= ): m32c/hw-config.h =20 -@SIM_ENABLE_ARCH_m32c_TRUE@m32c/%.o: m32c/%.c -@SIM_ENABLE_ARCH_m32c_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@= F) - @SIM_ENABLE_ARCH_m32c_TRUE@m32c/%.o: common/%.c @SIM_ENABLE_ARCH_m32c_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@= F) @SIM_ENABLE_ARCH_m32c_TRUE@m32c/modules.c: | $(m32c_BUILD_OUTPUTS) diff --git a/sim/m32c/Makefile.in b/sim/m32c/Makefile.in index 4c91e57dd2d..02d204366ac 100644 --- a/sim/m32c/Makefile.in +++ b/sim/m32c/Makefile.in @@ -19,7 +19,4 @@ ### along with this program. If not, see . =20 ## COMMON_PRE_CONFIG_FRAG - -SIM_EXTRA_CFLAGS =3D -DTIMER_A - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/m32c/local.mk b/sim/m32c/local.mk index 56332402f32..e992b01d306 100644 --- a/sim/m32c/local.mk +++ b/sim/m32c/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 -DTIMER_A + %C%_libsim_a_SOURCES =3D %C%_libsim_a_LIBADD =3D \ $(common_libcommon_a_OBJECTS) \ @@ -35,9 +37,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)