From 2ff6b38acb8cc82e3b577f0f42b98735feb821c3 Mon Sep 17 00:00:00 2001
From: Stan Shebs <shebs@codesourcery.com>
Date: Tue, 13 Sep 1994 00:50:38 +0000
Subject: [PATCH] Merge supposedly (but not really) GM-specific bits into
 general MPW config

---
 gdb/.Sanitize      | 16 +---------------
 gdb/ChangeLog.gm   |  6 ------
 gdb/ChangeLog.mpw  |  9 +++++++++
 gdb/mpw-config.in  | 19 +++++++++++++++----
 gdb/mpw-make.in    | 38 ++++++++++++++++++++++++++++++++------
 gdb/mpw-xconfig.in | 14 --------------
 6 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 7fb7199f0f..4a74835ba7 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -15,7 +15,7 @@
 
 Do-first:
 
-mpw_files="mpw-config.in mpw-make.in ser-mac.c mac-xdep.c mac-defs.h macgdb.r ChangeLog.mpw"
+mpw_files="mpw-config.in mpw-make.in ser-mac.c mac-xdep.c mac-defs.h macgdb.r mpw-init.c ChangeLog.mpw"
 
 if ( echo $* | grep keep\-mpw > /dev/null ) ; then
 	keep_these_too="${mpw_files} ${keep_these_too}"
@@ -29,20 +29,6 @@ else
 	fi
 fi
 
-gm_files="mpw-xconfig.in mpw-init.c ChangeLog.gm"
-
-if ( echo $* | grep keep\-gm > /dev/null ) ; then
-	keep_these_too="${gm_files} ${keep_these_too}"
-	if [ -n "${verbose}" ] ; then
-		echo Keeping ${gm_files}
-	fi
-else
-	lose_these_too="${gm_files} ${lose_these_too}"
-	if [ -n "${verbose}" ] ; then
-		echo Deleting ${gm_files}
-	fi
-fi
-
 hpread_files="hpread.c ChangeLog.hpread"
 
 if ( echo $* | grep keep\-hpread > /dev/null ) ; then
diff --git a/gdb/ChangeLog.gm b/gdb/ChangeLog.gm
index eb2cb4a5b3..e69de29bb2 100644
--- a/gdb/ChangeLog.gm
+++ b/gdb/ChangeLog.gm
@@ -1,6 +0,0 @@
-Thu Mar 10 15:51:40 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* mpw-xconfig.in: New file, mips-targeting config fragment.
-	* mpw-init.c: New file, MPW x mips version of init.c.
-
-
diff --git a/gdb/ChangeLog.mpw b/gdb/ChangeLog.mpw
index 1f05f10a23..4420fe4391 100644
--- a/gdb/ChangeLog.mpw
+++ b/gdb/ChangeLog.mpw
@@ -1,3 +1,11 @@
+Mon Sep 12 17:44:58 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* mpw-config.in: Use nm-empty.h if host is not target.
+	(xdepfiles): Add mac-xdep.c.o.
+	(xm_file): Remove.
+	* mpw-make.in: Add Fortran files.
+	(XDEPFILES): Remove.
+
 Fri Aug 19 15:23:40 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* mpw-init.c (initialize_all_files): Remove inits of utils and
@@ -130,4 +138,5 @@ Thu Mar 10 15:49:05 1994  Stan Shebs  (shebs@andros.cygnus.com)
 	* mpw-make.in: New file, MPW makefile fragment.
 	* config/m68k/xm-mpw.h: New file, MPW host definitions.
 	* ser-mac.c: New file, Mac serial interface.
+	* mpw-init.c: New file, MPW x mips version of init.c.
 
diff --git a/gdb/mpw-config.in b/gdb/mpw-config.in
index d6da2ba80c..574a583439 100644
--- a/gdb/mpw-config.in
+++ b/gdb/mpw-config.in
@@ -4,6 +4,8 @@ forward-include "{srcdir}"config:m68k:xm-mpw.h xm.h
 
 forward-include "{srcdir}"config:m68k:xm-m68k.h 'm68k/xm-m68k.h'
 
+Set xdepfiles   '"{o}"mac-xdep.c.o'
+
 # Make a copy of this file and give it a different name, so it
 # won't be confused with GDB's serial.h.
 
@@ -11,8 +13,17 @@ Duplicate -y "{MPW}"Interfaces:CIncludes:Serial.h MacSerial.h
 
 Echo "/* dummy */" >termio.h
 
-Set xdepfiles   " "
-Set natdepfiles " "
-Set tdepfiles   " "
+If "{target_canonical}" =~ /mips-idt-ecoff/
+	forward-include "{srcdir}"config:mips:tm-idt.h tm.h
+
+	forward-include "{srcdir}"config:mips:tm-bigmips.h 'mips/tm-bigmips.h'
+	forward-include "{srcdir}"config:mips:tm-mips.h 'mips/tm-mips.h'
+
+	Set tdepfiles '"{o}"mips-pinsn.c.o "{o}"mips-tdep.c.o "{o}"exec.c.o "{o}"remote-mips.c.o'
+End If
+
+If "{target_canonical}" != "{host_canonical}"
+	forward-include "{srcdir}"config:nm-empty.h nm.h
+	Set natdepfiles " "
+End If
 
-Set xm_file '"{s}"xm-mpw.h'
diff --git a/gdb/mpw-make.in b/gdb/mpw-make.in
index c16999c312..94a667e193 100644
--- a/gdb/mpw-make.in
+++ b/gdb/mpw-make.in
@@ -5,8 +5,6 @@ XM_CDEPS =
 TM_CDEPS = 
 NAT_CDEPS = 
 
-XDEPFILES = "{o}"mac-xdep.c.o
-
 CC_LD = Link
 
 gC = gC1
@@ -652,9 +650,9 @@ OBS =	"{o}"version.c.o "{o}"main.c.o "{o}"top.c.o "{o}"blockframe.c.o "{o}"break
 	"{o}"utils.c.o "{o}"expprint.c.o "{o}"environ.c.o "{o}"gdbtypes.c.o "{o}"copying.c.o {DEPFILES} \Option-d
 	"{o}"mem-break.c.o "{o}"target.c.o "{o}"parse.c.o "{o}"language.c.o {YYOBJ} "{o}"buildsym.c.o \Option-d
 	"{o}"objfiles.c.o "{o}"minsyms.c.o "{o}"maint.c.o "{o}"demangle.c.o "{o}"dbxread.c.o "{o}"coffread.c.o "{o}"elfread.c.o \Option-d
-	"{o}"dwarfread.c.o "{o}"mipsread.c.o "{o}"stabsread.c.o "{o}"core.c.o "{o}"c-lang.c.o "{o}"ch-lang.c.o "{o}"m2-lang.c.o \Option-d
-	"{o}"complaints.c.o "{o}"typeprint.c.o "{o}"c-typeprint.c.o "{o}"ch-typeprint.c.o "{o}"m2-typeprint.c.o \Option-d
-	"{o}"c-valprint.c.o "{o}"cp-valprint.c.o "{o}"ch-valprint.c.o "{o}"m2-valprint.c.o "{o}"nlmread.c.o \Option-d
+	"{o}"dwarfread.c.o "{o}"mipsread.c.o "{o}"stabsread.c.o "{o}"core.c.o "{o}"c-lang.c.o "{o}"ch-lang.c.o "{o}"f-lang.c.o "{o}"m2-lang.c.o \Option-d
+	"{o}"complaints.c.o "{o}"typeprint.c.o "{o}"c-typeprint.c.o "{o}"ch-typeprint.c.o "{o}"f-typeprint.c.o "{o}"m2-typeprint.c.o \Option-d
+	"{o}"c-valprint.c.o "{o}"cp-valprint.c.o "{o}"ch-valprint.c.o "{o}"f-valprint.c.o "{o}"m2-valprint.c.o "{o}"nlmread.c.o \Option-d
 	"{o}"serial.c.o "{o}"mdebugread.c.o "{o}"annotate.c.o
 
 TSOBS =
@@ -669,7 +667,7 @@ SUBDIRS = doc testsuite
 
 # For now, shortcut the "configure GDB for fewer languages" stuff.
 YYFILES = "{o}"c-exp.tab.c "{o}"m2-exp.tab.c "{o}"ch-exp.tab.c
-YYOBJ = "{o}"c-exp.tab.c.o "{o}"m2-exp.tab.c.o "{o}"ch-exp.tab.c.o
+YYOBJ = "{o}"c-exp.tab.c.o "{o}"m2-exp.tab.c.o "{o}"ch-exp.tab.c.o "{o}"f-exp.tab.c.o
 
 # Prevent Sun make from putting in the machine type.  Setting
 # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
@@ -1008,6 +1006,20 @@ copying.c \Option-f  COPYING copying.awk
 	Delete -y y.tab.c
 	Rename -y c-exp.new "{o}"c-exp.tab.c
 
+"{o}"f-exp.tab.c.o \Option-f  "{o}"f-exp.tab.c
+
+"{o}"f-exp.tab.c \Option-f  "{s}"f-exp.y
+	{YACC} {YFLAGS} "{s}"f-exp.y
+	sed -e ':extern.*malloc:d' \Option-d
+	    -e ':extern.*realloc:d' \Option-d
+	    -e ':extern.*free:d' \Option-d
+	    -e ':include.*malloc.h:d' \Option-d
+	    -e 's:malloc:xmalloc:g' \Option-d
+	    -e 's:realloc:xrealloc:g' \Option-d
+	  < y.tab.c > f-exp.new
+	Delete -y y.tab.c
+	Rename -y f-exp.new "{o}"f-exp.tab.c
+
 # ch-exp.tab.c is generated in objdir from "{s}"ch-exp.y if it doesn't exist
 # in srcdir, then compiled in objdir to ch-exp.tab.c.o.
 # Remove bogus decls for malloc:realloc:free which conflict with everything
@@ -1195,6 +1207,16 @@ MAKEOVERRIDES=
 "{o}"expprint.c.o \Option-f  "{s}"expprint.c {defs_h} {expression_h} {gdbtypes_h} \Option-d
 	"{s}"language.h "{s}"parser-defs.h {symtab_h} {value_h}
 
+"{o}"f-lang.c.o \Option-f  "{s}"f-lang.c "{s}"f-lang.h {defs_h} {expression_h} {gdbtypes_h} \Option-d
+	"{s}"language.h "{s}"parser-defs.h {symtab_h}
+
+"{o}"f-typeprint.c.o \Option-f  "{s}"f-typeprint.c "{s}"f-lang.h {defs_h} {expression_h} \Option-d
+	{gdbcmd_h} {gdbcore_h} {gdbtypes_h} "{s}"language.h {symtab_h} "{s}"target.h \Option-d
+	"{s}"typeprint.h {value_h}
+
+"{o}"f-valprint.c.o \Option-f  "{s}"f-valprint.c {defs_h} {expression_h} {gdbtypes_h} \Option-d
+	"{s}"language.h {symtab_h} "{s}"valprint.h {value_h}
+
 "{o}"findvar.c.o \Option-f  "{s}"findvar.c {defs_h} {gdbcore_h} {inferior_h} "{s}"target.h
 
 "{o}"fork-child.c.o \Option-f  "{s}"fork-child.c {wait_h} {defs_h} {gdbcore_h} \Option-d
@@ -1529,6 +1551,10 @@ c-exp.tab.c.o \Option-f  c-exp.tab.c "{s}"c-lang.h {defs_h} {expression_h} \Opti
 	{gdbtypes_h} "{s}"language.h "{s}"parser-defs.h {symtab_h} {value_h} \Option-d
 	{bfd_h} "{s}"objfiles.h "{s}"symfile.h
 
+f-exp.tab.c.o \Option-f  f-exp.tab.c "{s}"f-lang.h {defs_h} {expression_h} \Option-d
+	{gdbtypes_h} "{s}"language.h "{s}"parser-defs.h {symtab_h} {value_h} \Option-d
+	{bfd_h} "{s}"objfiles.h "{s}"symfile.h
+
 ch-exp.tab.c.o \Option-f  ch-exp.tab.c "{s}"ch-lang.h {defs_h} {expression_h} \Option-d
 	{gdbtypes_h} "{s}"language.h "{s}"parser-defs.h {symtab_h} {value_h} \Option-d
 	{bfd_h} "{s}"objfiles.h "{s}"symfile.h
diff --git a/gdb/mpw-xconfig.in b/gdb/mpw-xconfig.in
index 73e9781576..e69de29bb2 100644
--- a/gdb/mpw-xconfig.in
+++ b/gdb/mpw-xconfig.in
@@ -1,14 +0,0 @@
-# Extra configuration fragment for GDB.
-
-If "{target_canonical}" =~ /mips-idt-ecoff/
-	forward-include "{srcdir}"config:mips:tm-idt.h tm.h
-	forward-include "{srcdir}"config:nm-trash.h nm.h
-
-	forward-include "{srcdir}"config:mips:tm-bigmips.h 'mips/tm-bigmips.h'
-	forward-include "{srcdir}"config:mips:tm-mips.h 'mips/tm-mips.h'
-
-	Set tdepfiles '"{o}"mips-pinsn.c.o "{o}"mips-tdep.c.o "{o}"exec.c.o "{o}"remote-mips.c.o'
-
-	Set tm_file '"{s}"tm-idt.h'
-End If
-