* config/sparc/xm-sparc.h (HAVE_WAIT_STRUCT): Remove, never used.

	* config/sparc/nm-nbsd.h (CHILD_PREPARE_TO_STORE): Move to here
	from config/sparc/xm-nbsd.h.
	* config/sparc/nm-sun4os4 (CHILD_PREPARE_TO_STORE): Ditto, from
	config/sparc/xm-sparc.h.
	* config/sparc/nm-sun4sol2.h: New file, renamed from nm-sysv4.h.
	(PRSVADDR_BROKEN): Move here from xm-sun4sol2.h.
	* config/sparc/sun4sol2.mh (NAT_FILE): Update.
	* config/sparc/xm-sun4os4.h (HAVE_TERMIOS): Remove.
housekeeping

9 files changed, 36 insertions, 25 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aec9fe3..6716dc7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+Wed Jan 31 18:36:27 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* config/sparc/xm-sparc.h (HAVE_WAIT_STRUCT): Remove, never used.
+
+	* config/sparc/nm-nbsd.h (CHILD_PREPARE_TO_STORE): Move to here
+	from config/sparc/xm-nbsd.h.
+	* config/sparc/nm-sun4os4 (CHILD_PREPARE_TO_STORE): Ditto, from
+	config/sparc/xm-sparc.h.
+	* config/sparc/nm-sun4sol2.h: New file, renamed from nm-sysv4.h.
+	(PRSVADDR_BROKEN): Move here from xm-sun4sol2.h.
+	* config/sparc/sun4sol2.mh (NAT_FILE): Update.
+	* config/sparc/xm-sun4os4.h (HAVE_TERMIOS): Remove.
+
 Wed Jan 31 17:20:26 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* config/pa/tm-hppa.h (EXTRACT_RETURN_VALUE): Handle software
diff --git a/gdb/config/sparc/nm-nbsd.h b/gdb/config/sparc/nm-nbsd.h
index 5420745..0ab5c1a 100644
--- a/gdb/config/sparc/nm-nbsd.h
+++ b/gdb/config/sparc/nm-nbsd.h
@@ -1,5 +1,6 @@
 /* Native-dependent definitions for Sparc running NetBSD, for GDB.
-   Copyright 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1989, 1992, 1995, 1996
+   Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -25,4 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define FETCH_INFERIOR_REGISTERS
 
+/* Before storing, we need to read all the registers.  */
+
+#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
+
 #endif /* NM_NBSD_H */
diff --git a/gdb/config/sparc/nm-sun4os4.h b/gdb/config/sparc/nm-sun4os4.h
index 1b7fabb..9da96be 100644
--- a/gdb/config/sparc/nm-sun4os4.h
+++ b/gdb/config/sparc/nm-sun4os4.h
@@ -25,6 +25,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define FETCH_INFERIOR_REGISTERS
 
+/* Before storing, we need to read all the registers.  */
+
+#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
+
 /* Return sizeof user struct to callers in less machine dependent routines */
 
 #define KERNEL_U_SIZE kernel_u_size()
diff --git a/gdb/config/sparc/nm-sysv4.h b/gdb/config/sparc/nm-sun4sol2.h
index 3a46520..f3cfe6b 100644
--- a/gdb/config/sparc/nm-sysv4.h
+++ b/gdb/config/sparc/nm-sun4sol2.h
@@ -19,4 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Include the generic SVR4 definitions.  */
 
-#include "nm-sysv4.h"
+#include <nm-sysv4.h>
+
+/* Before storing, we need to read all the registers.  */
+
+#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
+
+/* Solaris PSRVADDR support does not seem to include a place for nPC.  */
+
+#define PRSVADDR_BROKEN
diff --git a/gdb/config/sparc/sun4sol2.mh b/gdb/config/sparc/sun4sol2.mh
index 847d2a1..b24ce9f 100644
--- a/gdb/config/sparc/sun4sol2.mh
+++ b/gdb/config/sparc/sun4sol2.mh
@@ -4,7 +4,7 @@ XM_FILE= xm-sun4sol2.h
 XDEPFILES= ser-tcp.o
 XM_CLIBS= -lsocket -lnsl
 
-NAT_FILE= nm-sysv4.h
+NAT_FILE= nm-sun4sol2.h
 NATDEPFILES= corelow.o core-sol2.o solib.o procfs.o fork-child.o
 
 # SVR4 comes standard with terminfo, and in some implementations, the
diff --git a/gdb/config/sparc/xm-nbsd.h b/gdb/config/sparc/xm-nbsd.h
index 38bb04a..95fe846 100644
--- a/gdb/config/sparc/xm-nbsd.h
+++ b/gdb/config/sparc/xm-nbsd.h
@@ -19,6 +19,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Get generic NetBSD host definitions. */
 #include "xm-nbsd.h"
-
-/* Before storing, we need to read all the registers. */
-#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
diff --git a/gdb/config/sparc/xm-sparc.h b/gdb/config/sparc/xm-sparc.h
index 8625ee9..06c247e 100644
--- a/gdb/config/sparc/xm-sparc.h
+++ b/gdb/config/sparc/xm-sparc.h
@@ -20,12 +20,3 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
-
-/* Before storing, we need to read all the registers.  */
-
-#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
-
-/* It does have a wait structure, and it might help things out . . . */
-
-#define HAVE_WAIT_STRUCT
-
diff --git a/gdb/config/sparc/xm-sun4os4.h b/gdb/config/sparc/xm-sun4os4.h
index 2435154..f6b465e 100644
--- a/gdb/config/sparc/xm-sun4os4.h
+++ b/gdb/config/sparc/xm-sun4os4.h
@@ -1,5 +1,6 @@
 /* Macro definitions for running gdb on a Sun 4 running sunos 4.
-   Copyright (C) 1989, Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1994, 1995, 1996
+   Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -18,6 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "sparc/xm-sparc.h"
+
 #define FPU
 
 /* If you expect to use the mmalloc package to obtain mapped symbol files,
@@ -40,9 +42,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* SunOS 4.x uses nonstandard "char *" as type of third argument to ptrace() */
 
 #define PTRACE_ARG3_TYPE char*
-
-/* Using termios is required to save and restore ICRNL and ONLCR
-   separately.  */
-
-/* At least SunOS 4.1.1 has termios.  I'm not sure about 4.0.3.  */
-#define HAVE_TERMIOS
diff --git a/gdb/config/sparc/xm-sun4sol2.h b/gdb/config/sparc/xm-sun4sol2.h
index 718c59d..ec5390f 100644
--- a/gdb/config/sparc/xm-sun4sol2.h
+++ b/gdb/config/sparc/xm-sun4sol2.h
@@ -48,9 +48,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* May be needed, may be not?  From Pace Willisson's port.  FIXME.  */
 #define NEED_POSIX_SETPGID
 
-/* Solaris PSRVADDR support does not seem to include a place for nPC.  */
-#define PRSVADDR_BROKEN
-
 /* solaris doesn't have siginterrupt, though it has sigaction; however,
    in this case siginterrupt would just be setting the default. */
 #define NO_SIGINTERRUPT