From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 937E73858410 for ; Tue, 3 Jan 2023 07:57:39 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 484A7340CEE; Tue, 3 Jan 2023 07:57:39 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 42/83] sim: bpf: move arch-specific file compilation to top-level Date: Tue, 3 Jan 2023 02:55:24 -0500 Message-Id: <20230103075605.13606-43-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,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: We can drop the arch-specific rules from the subdir as they're no longer used. --- sim/Makefile.in | 10 +++++++--- sim/bpf/Makefile.in | 23 ----------------------- sim/bpf/local.mk | 11 ++++++++--- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/sim/bpf/Makefile.in b/sim/bpf/Makefile.in index 64ec667c12c7..2376b859dd81 100644 --- a/sim/bpf/Makefile.in +++ b/sim/bpf/Makefile.in @@ -22,27 +22,4 @@ SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=64 ## COMMON_POST_CONFIG_FRAG -# Dependencies for binaries from CGEN generated source - -mloop-le.o: mloop-le.c - $(COMPILE) -DWANT_ISA_EBPFLE mloop-le.c - $(POSTCOMPILE) -mloop-be.o: mloop-be.c - $(COMPILE) -DWANT_ISA_EBPFBE mloop-be.c - $(POSTCOMPILE) - -decode-le.o: decode-le.c - $(COMPILE) -DWANT_ISA_EBPFLE $(srcdir)/decode-le.c - $(POSTCOMPILE) -decode-be.o: decode-be.c - $(COMPILE) -DWANT_ISA_EBPFBE $(srcdir)/decode-be.c - $(POSTCOMPILE) - -sem-le.o: sem-le.c - $(COMPILE) -DWANT_ISA_EBPFLE $(srcdir)/sem-le.c - $(POSTCOMPILE) -sem-be.o: sem-be.c - $(COMPILE) -DWANT_ISA_EBPFBE $(srcdir)/sem-be.c - $(POSTCOMPILE) - arch = bpf diff --git a/sim/bpf/local.mk b/sim/bpf/local.mk index 19dcc25736c1..580f744520c8 100644 --- a/sim/bpf/local.mk +++ b/sim/bpf/local.mk @@ -15,6 +15,14 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . +AM_CPPFLAGS_%C% = -DWITH_TARGET_WORD_BITSIZE=64 +AM_CPPFLAGS_%C%_mloop_le.o = -DWANT_ISA_EBPFLE +AM_CPPFLAGS_%C%_mloop_be.o = -DWANT_ISA_EBPFBE +AM_CPPFLAGS_%C%_decode_le.o = -DWANT_ISA_EBPFLE +AM_CPPFLAGS_%C%_decode_be.o = -DWANT_ISA_EBPFBE +AM_CPPFLAGS_%C%_sem_le.o = -DWANT_ISA_EBPFLE +AM_CPPFLAGS_%C%_sem_be.o = -DWANT_ISA_EBPFBE + %C%_libsim_a_SOURCES = %C%_libsim_a_LIBADD = \ $(common_libcommon_a_OBJECTS) \ @@ -44,9 +52,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