From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id DD2373858C20; Tue, 10 Jan 2023 06:25:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD2373858C20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673331947; bh=65QsuCza4x1UK7NQnfFR8IWafj6ru+RK5pZa8JiBl/w=; h=From:To:Subject:Date:From; b=wxo86Ei4k1mQxrIqpuyqCFjm8HPm5ii3WfpRmhn+6O0Z8Sc/j3jtWIEmqD//yTTDv mQBS/wOo9MC/yIVNpzNO/SElM+17psg6JymjfzXnqg7hSApDYzaQtTFEFuokQ/ds5r A/mphSQm/eKUohO7K4mUF1/TIibWAQ0sI4LSsp6c= 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: arm: 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: b3e1c5d43d76311aa8da728a53e5d3998efb15b3 X-Git-Newrev: 688fba23d28aab026e0416d0758f395ad635da7a Message-Id: <20230110062547.DD2373858C20@sourceware.org> Date: Tue, 10 Jan 2023 06:25:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D688fba23d28a= ab026e0416d0758f395ad635da7a commit 688fba23d28aab026e0416d0758f395ad635da7a Author: Mike Frysinger Date: Sun Jan 1 13:36:50 2023 -0500 sim: arm: 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/arm/Makefile.in | 3 --- sim/arm/local.mk | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 69d085bc69c..34fff4a59f3 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2011,6 +2011,7 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/libsim.a \ @SIM_ENABLE_ARCH_aarch64_TRUE@ $(SIM_COMMON_LIBS) =20 +@SIM_ENABLE_ARCH_arm_TRUE@AM_CPPFLAGS_arm =3D -DMODET @SIM_ENABLE_ARCH_arm_TRUE@arm_libsim_a_SOURCES =3D=20 @SIM_ENABLE_ARCH_arm_TRUE@arm_libsim_a_LIBADD =3D \ @SIM_ENABLE_ARCH_arm_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -4689,9 +4690,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_aarch64_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) = $(@F) @SIM_ENABLE_ARCH_arm_TRUE@$(arm_libsim_a_OBJECTS) $(arm_libsim_a_LIBADD): = arm/hw-config.h =20 -@SIM_ENABLE_ARCH_arm_TRUE@arm/%.o: arm/%.c -@SIM_ENABLE_ARCH_arm_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_arm_TRUE@arm/%.o: common/%.c @SIM_ENABLE_ARCH_arm_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_avr_TRUE@$(avr_libsim_a_OBJECTS) $(avr_libsim_a_LIBADD): = avr/hw-config.h diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in index 24e1525d669..43d124d0ca6 100644 --- a/sim/arm/Makefile.in +++ b/sim/arm/Makefile.in @@ -16,7 +16,4 @@ # along with this program. If not, see . =20 ## COMMON_PRE_CONFIG_FRAG - -SIM_EXTRA_CFLAGS =3D -DMODET - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/arm/local.mk b/sim/arm/local.mk index e3ce50fc81a..68a56e61692 100644 --- a/sim/arm/local.mk +++ b/sim/arm/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 -DMODET + %C%_libsim_a_SOURCES =3D %C%_libsim_a_LIBADD =3D \ $(common_libcommon_a_OBJECTS) \ @@ -31,9 +33,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)