From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 57CF53858C83 for ; Mon, 2 Jan 2023 04:32:29 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 0B675340CA7; Mon, 2 Jan 2023 04:32:29 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 8/9] sim: or1k: hoist cgen rules to top-level Date: Sun, 1 Jan 2023 23:32:08 -0500 Message-Id: <20230102043209.21542-8-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230102043209.21542-1-vapier@gentoo.org> References: <20230102043209.21542-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,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: --- sim/Makefile.in | 8 ++++++++ sim/or1k/Makefile.in | 34 ---------------------------------- sim/or1k/local.mk | 8 ++++++++ 3 files changed, 16 insertions(+), 34 deletions(-) diff --git a/sim/or1k/Makefile.in b/sim/or1k/Makefile.in index 6b2a976d8aef..ca5bf1ae4eee 100644 --- a/sim/or1k/Makefile.in +++ b/sim/or1k/Makefile.in @@ -45,37 +45,3 @@ SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 ## COMMON_POST_CONFIG_FRAG arch = or1k - -stamps: stamp-arch stamp-cpu - -# NOTE: Generated source files are specified as full paths, -# e.g. $(srcdir)/arch.c, because make may decide the files live -# in objdir otherwise. - -OR1K_CGEN_DEPS = \ - $(CPU_DIR)/or1k.cpu \ - $(CPU_DIR)/or1k.opc \ - $(CPU_DIR)/or1kcommon.cpu \ - $(CPU_DIR)/or1korbis.cpu \ - $(CPU_DIR)/or1korfpx.cpu \ - Makefile - -stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(OR1K_CGEN_DEPS) - $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) \ - mach=or32,or32nd \ - archfile=$(CPU_DIR)/or1k.cpu \ - FLAGS="with-scache" - $(SILENCE) touch $@ -$(srcdir)/arch.h $(srcdir)/arch.c $(srcdir)/cpuall.h: $(CGEN_MAINT) stamp-arch - @true - -stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(OR1K_CGEN_DEPS) - $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ - cpu=or1k32bf \ - mach=or32,or32nd \ - archfile=$(CPU_DIR)/or1k.cpu \ - FLAGS="with-scache" \ - EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)" - $(SILENCE) touch $@ -$(srcdir)/cpu.h $(srcdir)/cpu.c $(srcdir)/model.c $(srcdir)/sem.c $(srcdir)/sem-switch.c $(srcdir)/decode.c $(srcdir)/decode.h: $(CGEN_MAINT) stamp-cpu - @true diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk index b332bfab59d6..1b5c44fa5edc 100644 --- a/sim/or1k/local.mk +++ b/sim/or1k/local.mk @@ -46,3 +46,11 @@ SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS) $(AM_V_at)touch $@ MOSTLYCLEANFILES += $(%C%_BUILD_OUTPUTS) + +%D%/cgen-arch: + $(AM_V_GEN)mach=or32,or32nd FLAGS="with-scache"; $(CGEN_GEN_ARCH) +%D%/arch.h %D%/arch.c %D%/cpuall.h: @CGEN_MAINT@ %D%/cgen-arch + +%D%/cgen-cpu-decode: + $(AM_V_GEN)cpu=or1k32bf mach=or32,or32nd FLAGS="with-scache" EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)"; $(CGEN_GEN_CPU_DECODE) +%D%/cpu.h %D%/cpu.c %D%/model.c %D%/sem.c %D%/sem-switch.c %D%/decode.c %D%/decode.h: @CGEN_MAINT@ %D%/cgen-cpu-decode -- 2.39.0