* configure.in (config/nm-empty.h): If cross only, use instead

	of config/nm-trash.h.
	* config/nm-trash.h: Remove.
	* config/nm-empty.h: New file.
	* config/i386/nm-m3.h: New file, includes config/nm-m3.h.
	* config/mips/nm-m3.h: New file, includes config/nm-m3.h.
	* config/m68k/nm-sysv4.h: New file, includes config/nm-sysv4.h.
	* config/mips/nm-sysv4.h: New file, includes config/nm-sysv4.h.
	* config/sparc/nm-sysv4.h: New file, includes config/nm-sysv4.h.

9 files changed, 129 insertions, 8 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b5a688dd..696c282 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,10 +1,22 @@
+Sun Sep  4 16:06:34 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* configure.in (config/nm-empty.h): If cross only, use instead
+	of config/nm-trash.h.
+	* config/nm-trash.h: Remove.
+	* config/nm-empty.h: New file.
+	* config/i386/nm-m3.h: New file, includes config/nm-m3.h.
+	* config/mips/nm-m3.h: New file, includes config/nm-m3.h.
+	* config/m68k/nm-sysv4.h: New file, includes config/nm-sysv4.h.
+	* config/mips/nm-sysv4.h: New file, includes config/nm-sysv4.h.
+	* config/sparc/nm-sysv4.h: New file, includes config/nm-sysv4.h.
+
 Fri Sep  2 19:11:40 1994  Stu Grossman  (grossman@cygnus.com)
 
-	* configure.in:  Don't ln gdbtk.tcl if it's already there.
+	* configure.in: Don't symlink to gdbtk.tcl if it's already there.
 
 Fri Sep  2 17:35:55 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
 
-	* configure.in: No longer looks for nm, tm, and xm headers in
+	* configure.in: No longer look for nm, tm, and xm headers in
 	  config/<header>; they are always in config/<cpu>/<header>.
 
 Fri Sep  2 16:40:03 1994  Stan Shebs  (shebs@andros.cygnus.com)
diff --git a/gdb/config/i386/nm-m3.h b/gdb/config/i386/nm-m3.h
new file mode 100644
index 0000000..d1b4e72
--- /dev/null
+++ b/gdb/config/i386/nm-m3.h
@@ -0,0 +1,22 @@
+/* Native-dependent definitions for Intel 386 running Mach 3.
+   Copyright 1994 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* Include the generic Mach 3 definitions.  */
+
+#include "nm-m3.h"
diff --git a/gdb/config/m68k/nm-sysv4.h b/gdb/config/m68k/nm-sysv4.h
new file mode 100644
index 0000000..2a43b41
--- /dev/null
+++ b/gdb/config/m68k/nm-sysv4.h
@@ -0,0 +1,22 @@
+/* Native-dependent definitions for Motorola 680x0 running SVR4.
+   Copyright 1994 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* Include the generic SVR4 definitions.  */
+
+#include "nm-sysv4.h"
diff --git a/gdb/config/mips/nm-m3.h b/gdb/config/mips/nm-m3.h
new file mode 100644
index 0000000..42b9f96
--- /dev/null
+++ b/gdb/config/mips/nm-m3.h
@@ -0,0 +1,22 @@
+/* Native-dependent definitions for mips running Mach 3.
+   Copyright 1994 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* Include the generic Mach 3 definitions.  */
+
+#include "nm-m3.h"
diff --git a/gdb/config/mips/nm-sysv4.h b/gdb/config/mips/nm-sysv4.h
new file mode 100644
index 0000000..96473bd
--- /dev/null
+++ b/gdb/config/mips/nm-sysv4.h
@@ -0,0 +1,22 @@
+/* Native-dependent definitions for mips running SVR4.
+   Copyright 1994 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* Include the generic SVR4 definitions.  */
+
+#include "nm-sysv4.h"
diff --git a/gdb/config/nm-empty.h b/gdb/config/nm-empty.h
new file mode 100644
index 0000000..7069d8c
--- /dev/null
+++ b/gdb/config/nm-empty.h
@@ -0,0 +1,2 @@
+/* This is just a dummy file to symlink to when GDB is configured as a
+   cross-only debugger.  */
diff --git a/gdb/config/nm-trash.h b/gdb/config/nm-trash.h
deleted file mode 100644
index 38bed5a..0000000
--- a/gdb/config/nm-trash.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* this file is temporary scaffolding until all hosts have the
-   native/target/host split in place.  FIXME.  */
diff --git a/gdb/config/sparc/nm-sysv4.h b/gdb/config/sparc/nm-sysv4.h
new file mode 100644
index 0000000..d3c3aae
--- /dev/null
+++ b/gdb/config/sparc/nm-sysv4.h
@@ -0,0 +1,22 @@
+/* Native-dependent definitions for Sparc running SVR4.
+   Copyright 1994 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* Include the generic SVR4 definitions.  */
+
+#include "nm-sysv4.h"
diff --git a/gdb/configure.in b/gdb/configure.in
index c6c796d..9ed3b46 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -361,7 +361,7 @@ host_makefile_frag=config/${gdb_host_cpu}/${gdb_host}.mh
 target_makefile_frag=config/${gdb_target_cpu}/${gdb_target}.mt
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
-# (NAT_FILE) is not set in the ?config/* file, we don't make the
+# (NAT_FILE) is not set in config/*/*.m[ht] files, we don't make the
 # corresponding links.  But we have to remove the xm.h files and tm.h
 # files anyway, e.g. when switching from "configure host" to
 # "configure none".
@@ -382,10 +382,9 @@ rm -f nm.h
 if [ "${nativefile}" != "" ]; then
 	files="${files} config/${gdb_host_cpu}/${nativefile}"
 	links="${links} nm.h"
-# temporary scaffolding until all hosts have the host/target/native
-# split in place.
 else
-	files="${files} config/nm-trash.h"
+	# A cross-only configuration.
+	files="${files} config/nm-empty.h"
 	links="${links} nm.h"
 fi