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 A31B83858C50 for ; Mon, 2 Jan 2023 04:32:31 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 43969340CA7; Mon, 2 Jan 2023 04:32:31 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 9/9] sim: cgen: drop common subdir build rules Date: Sun, 1 Jan 2023 23:32:09 -0500 Message-Id: <20230102043209.21542-9-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,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: Now that everything has been hoisted to the top-level, we can delete this unused logic. --- sim/arch-subdir.mk.in | 6 ---- sim/common/Make-common.in | 68 --------------------------------------- 2 files changed, 74 deletions(-) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 0626d12df108..85e1d84ede1d 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -62,12 +62,6 @@ MAINT = ; @true # The following line is commented depending upon --enable-maintainer-mode. @MAINTAINER_MODE_TRUE@MAINT = -# cgen support, enable with --enable-cgen-maint -CGEN_MAINT = ; @true -# The following line is commented in or out depending upon --enable-cgen-maint. -@CGEN_MAINT@CGEN_MAINT = -CGENDIR = @cgendir@ - SIM_INLINE = @SIM_INLINE@ SIM_HW_CFLAGS = @SIM_HW_CFLAGS@ diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index ab9b3a3985ff..35477d94bb8e 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -283,72 +283,4 @@ Makefile: Makefile.in $(srccom)/Make-common.in $(config.status) @SIM_COMMON_BUILD_FALSE@config.status: configure @SIM_COMMON_BUILD_FALSE@ $(ECHO_GEN) $(SHELL) ./config.status --recheck - -# CGEN support - -GUILE = `if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi` -CGEN = "$(GUILE) -l $(CGENDIR)/guile.scm -s" -CGENFLAGS = -v -CGEN_CPU_DIR = $(CGENDIR)/cpu - -# Most ports use the files here instead of cgen/cpu. -CPU_DIR = $(srcroot)/cpu - -CGEN_READ_SCM = $(CGENDIR)/sim.scm -CGEN_ARCH_SCM = $(CGENDIR)/sim-arch.scm -CGEN_CPU_SCM = $(CGENDIR)/sim-cpu.scm $(CGENDIR)/sim-model.scm -CGEN_DECODE_SCM = $(CGENDIR)/sim-decode.scm -CGEN_DESC_SCM = $(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm - -# Various choices for which cpu specific files to generate. -# These are passed to cgen.sh in the "extrafiles" argument. -CGEN_CPU_EXTR = /extr/ -CGEN_CPU_READ = /read/ -CGEN_CPU_WRITE = /write/ -CGEN_CPU_SEM = /sem/ -CGEN_CPU_SEMSW = /semsw/ - -CGEN_FLAGS_TO_PASS = \ - CGEN='$(CGEN)' \ - CGENFLAGS="$(CGENFLAGS)" - -# We store the generated files in the source directory until we decide to -# ship a Scheme interpreter with gdb/binutils. Maybe we never will. - -cgen-arch: force - $(SHELL) $(srccom)/cgen.sh arch $(srcdir) \ - $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ - $(arch) "$(FLAGS)" ignored "$(isa)" $(mach) ignored \ - $(archfile) ignored - -cgen-cpu: force - $(SHELL) $(srccom)/cgen.sh cpu $(srcdir) \ - $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ - $(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" \ - $(archfile) "$(EXTRAFILES)" - -cgen-defs: force - $(SHELL) $(srccom)/cgen.sh defs $(srcdir) \ - $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ - $(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" \ - $(archfile) ignored - -cgen-decode: force - $(SHELL) $(srccom)/cgen.sh decode $(srcdir) \ - $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ - $(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" \ - $(archfile) "$(EXTRAFILES)" - -cgen-cpu-decode: force - $(SHELL) $(srccom)/cgen.sh cpu-decode $(srcdir) \ - $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ - $(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" \ - $(archfile) "$(EXTRAFILES)" - -cgen-desc: force - $(SHELL) $(srccom)/cgen.sh desc $(srcdir) \ - $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ - $(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" \ - $(archfile) ignored $(opcfile) - ## End COMMON_POST_CONFIG_FRAG -- 2.39.0