From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id D45893858409; Tue, 10 Jan 2023 06:28:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D45893858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673332084; bh=XiisxT0U/cvx6oMboMfuTUDtLkCrG9nP1AihDhfihjY=; h=From:To:Subject:Date:From; b=te9ReZ9YlPF4rPvO0mZJVT/3b0+7Api/J8gL0q4BA6jV8ab2DcS3bAcvt0RnVQSpB fAuqWKRH5+6WLY4/XwaDqrzh83FU5gn5QfF1/uAsU7ExkAybeAjZq6Vtsobw4oWzBK fZseA4UoH1YoihF7zKlsn+q0bCSnYWhtIOZivFNw= 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: rx: 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: 0db0b664a68aa34b3672ef7fd4ffa7a7dd89e76b X-Git-Newrev: 3e3e7217b0dcdbd618816786bbcc7aa943e3999d Message-Id: <20230110062804.D45893858409@sourceware.org> Date: Tue, 10 Jan 2023 06:28:04 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D3e3e7217b0dc= dbd618816786bbcc7aa943e3999d commit 3e3e7217b0dcdbd618816786bbcc7aa943e3999d Author: Mike Frysinger Date: Sun Jan 1 14:24:16 2023 -0500 sim: rx: 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/rx/Makefile.in | 3 --- sim/rx/local.mk | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index f19f245553b..6cae85c8038 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2867,6 +2867,7 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_rl78_TRUE@ rl78/libsim.a \ @SIM_ENABLE_ARCH_rl78_TRUE@ $(SIM_COMMON_LIBS) =20 +@SIM_ENABLE_ARCH_rx_TRUE@AM_CPPFLAGS_rx =3D $(SIM_RX_CYCLE_ACCURATE_FLAGS) @SIM_ENABLE_ARCH_rx_TRUE@rx_libsim_a_SOURCES =3D=20 @SIM_ENABLE_ARCH_rx_TRUE@rx_libsim_a_LIBADD =3D \ @SIM_ENABLE_ARCH_rx_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -5410,9 +5411,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_rl78_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@= F) @SIM_ENABLE_ARCH_rx_TRUE@$(rx_libsim_a_OBJECTS) $(rx_libsim_a_LIBADD): rx/= hw-config.h =20 -@SIM_ENABLE_ARCH_rx_TRUE@rx/%.o: rx/%.c -@SIM_ENABLE_ARCH_rx_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_rx_TRUE@rx/%.o: common/%.c @SIM_ENABLE_ARCH_rx_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_sh_TRUE@$(sh_libsim_a_OBJECTS) $(sh_libsim_a_LIBADD): sh/= hw-config.h diff --git a/sim/rx/Makefile.in b/sim/rx/Makefile.in index 0c4a1f6ab6b..da241390ab1 100644 --- a/sim/rx/Makefile.in +++ b/sim/rx/Makefile.in @@ -19,7 +19,4 @@ ### along with the GNU simulators; if not, see . =20 ## COMMON_PRE_CONFIG_FRAG - -SIM_EXTRA_CFLAGS =3D @SIM_RX_CYCLE_ACCURATE_FLAGS@ - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/rx/local.mk b/sim/rx/local.mk index c23ac4f8035..7115286a9b5 100644 --- a/sim/rx/local.mk +++ b/sim/rx/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 $(SIM_RX_CYCLE_ACCURATE_FLAGS) + %C%_libsim_a_SOURCES =3D %C%_libsim_a_LIBADD =3D \ $(common_libcommon_a_OBJECTS) \ @@ -34,9 +36,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)