From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 890313858413; Tue, 10 Jan 2023 06:26:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 890313858413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673331993; bh=gqOG+j6eeDxSoRzkq4jYZsQ8Ab7J59ZNK84BlJKQ2fc=; h=From:To:Subject:Date:From; b=tPxzPYoQHjHVI6yuC1tRvYBJ1Jm88qtl0tXbWif1BGOXNpXyzFF+HsuQ2q/Hexo3V J94aiFPEVXWhOPFeEvq/szewkGFraowOvaqTxwG100Mhzvbe4hzKYrQQR9KPeQdUJj zthOe6RC9YFL2h/cl4uOkN+F3mXiveTLKa4FDHiQ= 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: frv: 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: 8ba643c31e8cc1708b70be5c5fafbcc455492427 X-Git-Newrev: 5ea1eaea7a1620b08f0d23b7faaab9f70bcb031c Message-Id: <20230110062633.890313858413@sourceware.org> Date: Tue, 10 Jan 2023 06:26:33 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D5ea1eaea7a16= 20b08f0d23b7faaab9f70bcb031c commit 5ea1eaea7a1620b08f0d23b7faaab9f70bcb031c Author: Mike Frysinger Date: Sun Jan 1 13:43:06 2023 -0500 sim: frv: 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 | 6 +++--- sim/frv/Makefile.in | 6 ------ sim/frv/local.mk | 9 ++++++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 3eebde764c9..1ea1ddb3308 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2274,6 +2274,9 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_examples_TRUE@ example-synacor/libsim.a \ @SIM_ENABLE_ARCH_examples_TRUE@ $(SIM_COMMON_LIBS) =20 +@SIM_ENABLE_ARCH_frv_TRUE@AM_CPPFLAGS_frv =3D $(SIM_FRV_TRAPDUMP_FLAGS) +@SIM_ENABLE_ARCH_frv_TRUE@AM_CFLAGS_frv_memory.o =3D -Wno-error +@SIM_ENABLE_ARCH_frv_TRUE@AM_CFLAGS_frv_sem.o =3D -Wno-error @SIM_ENABLE_ARCH_frv_TRUE@frv_libsim_a_SOURCES =3D=20 @SIM_ENABLE_ARCH_frv_TRUE@frv_libsim_a_LIBADD =3D \ @SIM_ENABLE_ARCH_frv_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -4883,9 +4886,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_examples_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D)= $(@F) @SIM_ENABLE_ARCH_frv_TRUE@$(frv_libsim_a_OBJECTS) $(frv_libsim_a_LIBADD): = frv/hw-config.h =20 -@SIM_ENABLE_ARCH_frv_TRUE@frv/%.o: frv/%.c -@SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_frv_TRUE@frv/%.o: common/%.c @SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_frv_TRUE@frv/modules.c: | $(frv_BUILD_OUTPUTS) diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in index f577873c057..d898bcbc249 100644 --- a/sim/frv/Makefile.in +++ b/sim/frv/Makefile.in @@ -16,12 +16,6 @@ # along with this program. If not, see . =20 ## COMMON_PRE_CONFIG_FRAG - -SIM_EXTRA_CFLAGS =3D @SIM_FRV_TRAPDUMP_FLAGS@ - -# Some modules don't build cleanly yet. -memory.o sem.o: SIM_WERROR_CFLAGS =3D - ## COMMON_POST_CONFIG_FRAG =20 arch =3D frv diff --git a/sim/frv/local.mk b/sim/frv/local.mk index 2451235d238..a060a46ffa8 100644 --- a/sim/frv/local.mk +++ b/sim/frv/local.mk @@ -16,6 +16,12 @@ ## 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_FRV_TRAPDUMP_FLAGS) + +## Some modules don't build cleanly yet. +AM_CFLAGS_%C%_memory.o =3D -Wno-error +AM_CFLAGS_%C%_sem.o =3D -Wno-error + %C%_libsim_a_SOURCES =3D %C%_libsim_a_LIBADD =3D \ $(common_libcommon_a_OBJECTS) \ @@ -57,9 +63,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)