From ea52ff81ba88d9490d4fa765b922c764ab4c6f4a Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Mon, 8 Sep 2003 17:24:59 +0000
Subject: [PATCH] 2003-09-08  Dave Brolley  <brolley@redhat.com>

        On behalf of Doug Evans <dje@sebabeach.org>
        * cgen.sh: New arg archfile.
        * Make-common.in (cgen-arch,cgen-cpu,cgen-defs,cgen-decode,
        cgen-cpu-decode,cgen-desc): Update call to cgen.sh.
---
 sim/common/ChangeLog      |  7 +++++++
 sim/common/Make-common.in | 18 ++++++++++++------
 sim/common/cgen.sh        | 11 ++++++-----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index a13a488..ca6d384 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-08  Dave Brolley  <brolley@redhat.com>
+
+	On behalf of Doug Evans <dje@sebabeach.org>
+	* cgen.sh: New arg archfile.
+	* Make-common.in (cgen-arch,cgen-cpu,cgen-defs,cgen-decode,
+	cgen-cpu-decode,cgen-desc): Update call to cgen.sh.
+
 2003-08-28  Andrew Cagney  <cagney@redhat.com>
 
 	* dv-glue.c (hw_glue_finish): Change %d to %ld to match sizeof.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 53f898a..cc93bde 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -674,31 +674,37 @@ CGEN_FLAGS_TO_PASS = \
 cgen-arch: force
 	$(SHELL) $(srccom)/cgen.sh arch $(srcdir) \
 		$(CGEN) $(CGENDIR) "$(CGENFLAGS)" \
-		$(arch) "$(FLAGS)" ignored "$(isa)" $(mach) ignored ignored
+		$(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)" "$(EXTRAFILES)"
+		$(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)" ignored
+		$(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)" "$(EXTRAFILES)"
+		$(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)" "$(EXTRAFILES)"
+		$(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)" ignored
+		$(arch) "$(FLAGS)" $(cpu) "$(isa)" $(mach) "$(SUFFIX)" \
+		$(archfile) ignored
 
 ## End COMMON_POST_CONFIG_FRAG
diff --git a/sim/common/cgen.sh b/sim/common/cgen.sh
index bf467e1..172edcb 100644
--- a/sim/common/cgen.sh
+++ b/sim/common/cgen.sh
@@ -3,7 +3,7 @@
 #
 # Usage: /bin/sh cgen.sh {"arch"|"cpu"|"decode"|"defs"|"cpu-decode"} \
 #	srcdir cgen cgendir cgenflags \
-#	arch archflags cpu mach suffix extrafiles
+#	arch archflags cpu mach suffix archfile extrafiles
 #
 # We store the generated files in the source directory until we decide to
 # ship a Scheme interpreter (or other implementation) with gdb/binutils.
@@ -24,6 +24,7 @@ isa=$9
 # portably bring parameters beyond $9 into view
 shift ; mach=$9
 shift ; suffix=$9
+shift ; archfile=$9
 shift ; extrafiles=$9
 
 rootdir=${srcdir}/../..
@@ -57,7 +58,7 @@ arch)
 		${cgenflags} \
 		-f "${archflags}" \
 		-m ${mach} \
-		-a ${arch} \
+		-a ${archfile} \
 		-i ${isa} \
 		-A tmp-arch.h1 \
 		-B tmp-arch.c1 \
@@ -111,7 +112,7 @@ cpu | decode | cpu-decode)
 		${cgenflags} \
 		-f "${archflags}" \
 		-m ${mach} \
-		-a ${arch} \
+		-a ${archfile} \
 		-i ${isa} \
 		${fileopts}
 
@@ -180,7 +181,7 @@ defs)
 		${cgenflags} \
 		-f "${archflags}" \
 		-m ${mach} \
-		-a ${arch} \
+		-a ${archfile} \
 		-i ${isa} \
 		-G tmp-defs.h1
 	sed $sedscript < tmp-defs.h1 > tmp-defs.h
@@ -197,7 +198,7 @@ desc)
 		${cgenflags} \
 		-f "${archflags}" \
 		-m ${mach} \
-		-a ${arch} \
+		-a ${archfile} \
 		-i ${isa} \
 		-H tmp-desc.h1 \
 		-C tmp-desc.c1 \
-- 
2.7.4