* config/i386/nm-i386mach.h (CHILD_PREPARE_TO_STORE): Move to

	here from config/i386/xm-i386mach.h, fix name.
	* config/i386/nm-sun386.h: Ditto, from config/i386/xm-sun386.h.
	* config/i386/nm-ptx4.h (CHILD_PREPARE_TO_STORE): Move to
	here from config/i386/xm-ptx4.h.
	* config/i386/nm-ptx4.h: Ditto,	from config/i386/xm-ptx.h.
	* config/i386/nm-symmetry.h: Ditto, from config/i386/xm-symmetry.h.
	* config/m68k/nm-sun3.h: Ditto, from config/m68k/xm-sun3.h.
more housekeeping

11 files changed, 33 insertions, 25 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6716dc7..d4ffb70 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,15 +1,23 @@
 Wed Jan 31 18:36:27 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
+	* config/sparc/xm-sun4os4.h (HAVE_TERMIOS): Remove.
+
 	* 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/i386/nm-i386mach.h (CHILD_PREPARE_TO_STORE): Move to
+	here from config/i386/xm-i386mach.h, fix name.
+	* config/i386/nm-sun386.h: Ditto, from config/i386/xm-sun386.h.
+	* config/i386/nm-ptx4.h (CHILD_PREPARE_TO_STORE): Move to
+	here from config/i386/xm-ptx4.h.
+	* config/i386/nm-ptx4.h: Ditto,	from config/i386/xm-ptx.h.
+	* config/i386/nm-symmetry.h: Ditto, from config/i386/xm-symmetry.h.
+	* config/m68k/nm-sun3.h: Ditto, from config/m68k/xm-sun3.h.
+	* config/sparc/nm-nbsd.h: Ditto, from config/sparc/xm-nbsd.h.
+	* config/sparc/nm-sun4os4: 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)
 
diff --git a/gdb/config/i386/nm-i386mach.h b/gdb/config/i386/nm-i386mach.h
index 88fa4b0..f01d2b1 100644
--- a/gdb/config/i386/nm-i386mach.h
+++ b/gdb/config/i386/nm-i386mach.h
@@ -23,3 +23,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
 #define FETCH_INFERIOR_REGISTERS
 
+#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
diff --git a/gdb/config/i386/nm-ptx4.h b/gdb/config/i386/nm-ptx4.h
index bbeaed6..5e6cd56 100644
--- a/gdb/config/i386/nm-ptx4.h
+++ b/gdb/config/i386/nm-ptx4.h
@@ -32,6 +32,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define FETCH_INFERIOR_REGISTERS
 
+/* We must fetch all the regs before storing, since we store all at once.  */
+
+#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
+
 #define CHILD_WAIT
 struct target_waitstatus;
 extern int child_wait PARAMS ((int, struct target_waitstatus *));
diff --git a/gdb/config/i386/nm-sun386.h b/gdb/config/i386/nm-sun386.h
index 1b34c16..f7a904b 100644
--- a/gdb/config/i386/nm-sun386.h
+++ b/gdb/config/i386/nm-sun386.h
@@ -24,3 +24,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
 #define FETCH_INFERIOR_REGISTERS
 
+#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
diff --git a/gdb/config/i386/nm-symmetry.h b/gdb/config/i386/nm-symmetry.h
index d5e44b5..e8fb6b9 100644
--- a/gdb/config/i386/nm-symmetry.h
+++ b/gdb/config/i386/nm-symmetry.h
@@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define FETCH_INFERIOR_REGISTERS
 
+/* We must fetch all the regs before storing, since we store all at once.  */
+
+#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
+
 #ifdef _SEQUENT_
 #define CHILD_WAIT
 extern int child_wait PARAMS ((int, struct target_waitstatus *));
diff --git a/gdb/config/i386/xm-i386mach.h b/gdb/config/i386/xm-i386mach.h
index b409404..c50da67 100644
--- a/gdb/config/i386/xm-i386mach.h
+++ b/gdb/config/i386/xm-i386mach.h
@@ -29,8 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define KERNEL_U_ADDR (0x80000000 - (UPAGES * NBPG))
 
-#define PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
-
 /* <errno.h> only defines this if __STDC__!!! */
 extern int errno;
 
diff --git a/gdb/config/i386/xm-ptx.h b/gdb/config/i386/xm-ptx.h
index 3e6f69a..99b46cc 100644
--- a/gdb/config/i386/xm-ptx.h
+++ b/gdb/config/i386/xm-ptx.h
@@ -1,6 +1,7 @@
 /* Definitions to make GDB run on a Sequent Symmetry under ptx, with
-   Weitek 1167 and i387 support.  Copyright 1986, 1987, 1989, 1992,
-   1993 Free Software Foundation, Inc.
+   Weitek 1167 and i387 support.
+   Copyright 1986, 1987, 1989, 1992, 1993, 1996
+   Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -38,7 +39,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define USE_O_NOCTTY
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
-
-/* We must fetch all the regs before storing, since we store all at once.  */
-
-#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
diff --git a/gdb/config/i386/xm-sun386.h b/gdb/config/i386/xm-sun386.h
index c7bf688..51c3b58 100644
--- a/gdb/config/i386/xm-sun386.h
+++ b/gdb/config/i386/xm-sun386.h
@@ -18,5 +18,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 LITTLE_ENDIAN
-
-#define PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
diff --git a/gdb/config/i386/xm-symmetry.h b/gdb/config/i386/xm-symmetry.h
index af864dd..52e9a9a 100644
--- a/gdb/config/i386/xm-symmetry.h
+++ b/gdb/config/i386/xm-symmetry.h
@@ -26,7 +26,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define HAVE_WAIT_STRUCT
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
-
-/* We must fetch all the regs before storing, since we store all at once.  */
-
-#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
diff --git a/gdb/config/m68k/nm-sun3.h b/gdb/config/m68k/nm-sun3.h
index 1437c9f..e4ef8f4 100644
--- a/gdb/config/m68k/nm-sun3.h
+++ b/gdb/config/m68k/nm-sun3.h
@@ -1,5 +1,6 @@
-/* Host-dependent definitions for Sun-3 for GDB, the GNU debugger.
-   Copyright 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
+/* Native-only definitions for Sun-3 for GDB, the GNU debugger.
+   Copyright (C) 1986, 1987, 1989, 1991, 1992, 1996
+   Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -24,3 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
 
 #define FETCH_INFERIOR_REGISTERS
+
+/* We have to grab the regs since we store all regs at once.  */
+
+#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
diff --git a/gdb/config/m68k/xm-sun3.h b/gdb/config/m68k/xm-sun3.h
index 001af8a..3de7446 100644
--- a/gdb/config/m68k/xm-sun3.h
+++ b/gdb/config/m68k/xm-sun3.h
@@ -19,10 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define HOST_BYTE_ORDER BIG_ENDIAN
 
-/* We have to grab the regs since we store all regs at once.  */
-
-#define CHILD_PREPARE_TO_STORE() \
-	read_register_bytes (0, (char *)NULL, REGISTER_BYTES)
 
 /* Interface definitions for kernel debugger KDB.  */