From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 4603B3858CDB; Tue, 10 Jan 2023 06:27:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4603B3858CDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673332044; bh=SqRdHtpKpfTjH3sAxo4v2NXs+6f+kmhSVTCDq4h0VJI=; h=From:To:Subject:Date:From; b=d89FTLyu4DHKCIm0juDxlIMDB2R+FFHjj8NbJYZfbix6Kwod4A08+4GvnNMFsGEsi fE9jmj0EesRGtuzfgd/3dxDqo/Iz/k/EGkoZ/A/4yeHpS0Em8H1vNRC+Ph+ZN6OyBZ 7IyMeg9Y80i3c5Usge1+qg6SV15RuuePSUKxFXT8= 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: mips: 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: b7375a2dda6ca3b136a3835a78c18c9663aeb483 X-Git-Newrev: 1546cb45407f5228e8d4bdd948b7d0bc6c4d1b76 Message-Id: <20230110062724.4603B3858CDB@sourceware.org> Date: Tue, 10 Jan 2023 06:27:24 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1546cb45407f= 5228e8d4bdd948b7d0bc6c4d1b76 commit 1546cb45407f5228e8d4bdd948b7d0bc6c4d1b76 Author: Mike Frysinger Date: Sun Jan 1 14:16:58 2023 -0500 sim: mips: 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 | 8 +++++--- sim/mips/local.mk | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 0ef1950edf3..d26c8eb3def 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2586,6 +2586,11 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_microblaze_TRUE@ microblaze/libsim.a \ @SIM_ENABLE_ARCH_microblaze_TRUE@ $(SIM_COMMON_LIBS) =20 +@SIM_ENABLE_ARCH_mips_TRUE@AM_CPPFLAGS_mips =3D \ +@SIM_ENABLE_ARCH_mips_TRUE@ @SIM_MIPS_SUBTARGET@ \ +@SIM_ENABLE_ARCH_mips_TRUE@ -DWITH_TARGET_WORD_BITSIZE=3D@SIM_MIPS_BITSIZE= @ -DWITH_TARGET_WORD_MSB=3DWITH_TARGET_WORD_BITSIZE-1 \ +@SIM_ENABLE_ARCH_mips_TRUE@ -DWITH_FLOATING_POINT=3DHARD_FLOATING_POINT -D= WITH_TARGET_FLOATING_POINT_BITSIZE=3D@SIM_MIPS_FPU_BITSIZE@ + @SIM_ENABLE_ARCH_mips_TRUE@mips_GEN_OBJ =3D $(am__append_88) \ @SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_89) $(am__append_90) @SIM_ENABLE_ARCH_mips_TRUE@mips_libsim_a_SOURCES =3D=20 @@ -5089,9 +5094,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_microblaze_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@= D) $(@F) @SIM_ENABLE_ARCH_mips_TRUE@$(mips_libsim_a_OBJECTS) $(mips_libsim_a_LIBADD= ): mips/hw-config.h =20 -@SIM_ENABLE_ARCH_mips_TRUE@mips/%.o: mips/%.c -@SIM_ENABLE_ARCH_mips_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@= F) - @SIM_ENABLE_ARCH_mips_TRUE@mips/%.o: common/%.c @SIM_ENABLE_ARCH_mips_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@= F) @SIM_ENABLE_ARCH_mips_TRUE@mips/modules.c: | $(mips_BUILD_OUTPUTS) diff --git a/sim/mips/local.mk b/sim/mips/local.mk index f255ffca611..c25e50b1d65 100644 --- a/sim/mips/local.mk +++ b/sim/mips/local.mk @@ -16,6 +16,11 @@ ## 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_MIPS_SUBTARGET@ \ + -DWITH_TARGET_WORD_BITSIZE=3D@SIM_MIPS_BITSIZE@ -DWITH_TARGET_WORD_MSB=3D= WITH_TARGET_WORD_BITSIZE-1 \ + -DWITH_FLOATING_POINT=3DHARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_= BITSIZE=3D@SIM_MIPS_FPU_BITSIZE@ + %C%_GEN_OBJ =3D if SIM_MIPS_GEN_MODE_SINGLE %C%_GEN_OBJ +=3D \ @@ -69,9 +74,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)