From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 8D90A3858C52; Tue, 10 Jan 2023 06:27:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D90A3858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673332064; bh=ZW9CV+CzCJFZC7eytfAJAAq67OerMUCT29Ofgtd2/uw=; h=From:To:Subject:Date:From; b=ICmotWzeJlD28gtYzRIhxGz6Q/vNOHpDTgMIKz6Xg9BQOdpUTdgpGNszLoBh19lJA Adh93ciPUpsncAXoFoivZBU4wR772YpqKVSZzTFnRo6qs5L56t+vQ/w0MtZpx8E4B8 rQB4WizbXDVlDtIpD3IfYBp71U2CG+HNFOPp6hF8= 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: or1k: 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: 4fff443a1149a5264eb41e504a360b0b1d0612f6 X-Git-Newrev: b7bd5fe99b5fe73197df09b5010b55b7b915232c Message-Id: <20230110062744.8D90A3858C52@sourceware.org> Date: Tue, 10 Jan 2023 06:27:44 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Db7bd5fe99b5f= e73197df09b5010b55b7b915232c commit b7bd5fe99b5fe73197df09b5010b55b7b915232c Author: Mike Frysinger Date: Sun Jan 1 14:21:09 2023 -0500 sim: or1k: move arch-specific file compilation to top-level =20 The arch-specific compiler flags are duplicated, but they'll be cleaned up once we move all subdir compiles to the top-level. Diff: --- sim/Makefile.in | 4 +--- sim/or1k/local.mk | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index c4de9760b02..c8518a331b9 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2771,6 +2771,7 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_msp430_TRUE@ msp430/libsim.a \ @SIM_ENABLE_ARCH_msp430_TRUE@ $(SIM_COMMON_LIBS) =20 +@SIM_ENABLE_ARCH_or1k_TRUE@AM_CPPFLAGS_or1k =3D -DWITH_TARGET_WORD_BITSIZE= =3D32 -DWITH_TARGET_WORD_MSB=3D31 @SIM_ENABLE_ARCH_or1k_TRUE@or1k_libsim_a_SOURCES =3D=20 @SIM_ENABLE_ARCH_or1k_TRUE@or1k_libsim_a_LIBADD =3D \ @SIM_ENABLE_ARCH_or1k_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -5355,9 +5356,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_msp430_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $= (@F) @SIM_ENABLE_ARCH_or1k_TRUE@$(or1k_libsim_a_OBJECTS) $(or1k_libsim_a_LIBADD= ): or1k/hw-config.h =20 -@SIM_ENABLE_ARCH_or1k_TRUE@or1k/%.o: or1k/%.c -@SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@= F) - @SIM_ENABLE_ARCH_or1k_TRUE@or1k/%.o: common/%.c @SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@= F) @SIM_ENABLE_ARCH_or1k_TRUE@or1k/modules.c: | $(or1k_BUILD_OUTPUTS) diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk index a7412bfa07c..1294986a6d8 100644 --- a/sim/or1k/local.mk +++ b/sim/or1k/local.mk @@ -15,6 +15,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 -DWITH_TARGET_WORD_BITSIZE=3D32 -DWITH_TARGET_WORD_MSB= =3D31 + %C%_libsim_a_SOURCES =3D %C%_libsim_a_LIBADD =3D \ $(common_libcommon_a_OBJECTS) \ @@ -43,9 +45,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)