From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 5884D38432D3 for ; Tue, 3 Jan 2023 07:57:54 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 09D16340CD2; Tue, 3 Jan 2023 07:57:53 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 49/83] sim: frv: move arch-specific file compilation to top-level Date: Tue, 3 Jan 2023 02:55:31 -0500 Message-Id: <20230103075605.13606-50-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230103075605.13606-1-vapier@gentoo.org> References: <20230103075605.13606-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,KAM_SHORT,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The arch-specific flags are only used by the arch-specific modules, not the common/ files, so we can delete them too. --- 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/frv/Makefile.in b/sim/frv/Makefile.in index f577873c057a..d898bcbc2493 100644 --- a/sim/frv/Makefile.in +++ b/sim/frv/Makefile.in @@ -16,12 +16,6 @@ # along with this program. If not, see . ## COMMON_PRE_CONFIG_FRAG - -SIM_EXTRA_CFLAGS = @SIM_FRV_TRAPDUMP_FLAGS@ - -# Some modules don't build cleanly yet. -memory.o sem.o: SIM_WERROR_CFLAGS = - ## COMMON_POST_CONFIG_FRAG arch = frv diff --git a/sim/frv/local.mk b/sim/frv/local.mk index 2451235d2385..a060a46ffa8f 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 . +AM_CPPFLAGS_%C% = $(SIM_FRV_TRAPDUMP_FLAGS) + +## Some modules don't build cleanly yet. +AM_CFLAGS_%C%_memory.o = -Wno-error +AM_CFLAGS_%C%_sem.o = -Wno-error + %C%_libsim_a_SOURCES = %C%_libsim_a_LIBADD = \ $(common_libcommon_a_OBJECTS) \ @@ -57,9 +63,6 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%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) -- 2.39.0