2004-07-29 Andrew Cagney <cagney@gnu.org>

	* config/i386/xm-i386v.h (KERNEL_U_ADDR): Move from here ...
	* config/i386/nm-i386v42mp.h (KERNEL_U_ADDR): ... to here, ...
	* config/i386/nm-i386v4.h (KERNEL_U_ADDR): ... here, ...
	* config/i386/nm-i386v.h (KERNEL_U_ADDR): ... and here.
	* config/vax/xm-vax.h (KERNEL_U_ADDR): Move from here ...
	* config/vax/nm-vax.h (KERNEL_U_ADDR): ... to here.

6 files changed, 16 insertions, 11 deletions

diff --git a/gdb/config/i386/nm-i386v.h b/gdb/config/i386/nm-i386v.h
index f94c5bb..2d4eb60 100644
--- a/gdb/config/i386/nm-i386v.h
+++ b/gdb/config/i386/nm-i386v.h
@@ -32,7 +32,10 @@
 #define REGISTER_U_ADDR(addr, blockend, regnum) \
   (addr) = register_u_addr ((blockend), (regnum))
 extern CORE_ADDR register_u_addr (CORE_ADDR blockend, int regnum);
-
+
+/* This is the amount to subtract from u.u_ar0
+   to get the offset in the core file of the register values.  */
+#define KERNEL_U_ADDR 0xe0000000
 
 /* Number of traps that happen between exec'ing the shell to run an
    inferior, and when we finally get to the inferior code.  This is 2
diff --git a/gdb/config/i386/nm-i386v4.h b/gdb/config/i386/nm-i386v4.h
index 356d3cb..ac87cbc 100644
--- a/gdb/config/i386/nm-i386v4.h
+++ b/gdb/config/i386/nm-i386v4.h
@@ -24,3 +24,7 @@
 
 /* Poll causes GDB to hang, at least under Unixware 1.1.2.  */
 #define LOSING_POLL
+
+/* This is the amount to subtract from u.u_ar0
+   to get the offset in the core file of the register values.  */
+#define KERNEL_U_ADDR 0xe0000000
diff --git a/gdb/config/i386/nm-i386v42mp.h b/gdb/config/i386/nm-i386v42mp.h
index f6fced5..5b5c7f0 100644
--- a/gdb/config/i386/nm-i386v42mp.h
+++ b/gdb/config/i386/nm-i386v42mp.h
@@ -89,4 +89,8 @@
 /* Return whether PID contains a user-space thread id. */
 #define ISTID(PID) (ptid_get_tid (PID))
 
+/* This is the amount to subtract from u.u_ar0
+   to get the offset in the core file of the register values.  */
+#define KERNEL_U_ADDR 0xe0000000
+
 #endif /* NM_I386V42MP_H */
diff --git a/gdb/config/i386/xm-i386v.h b/gdb/config/i386/xm-i386v.h
index 1c32905..426889c 100644
--- a/gdb/config/i386/xm-i386v.h
+++ b/gdb/config/i386/xm-i386v.h
@@ -36,8 +36,3 @@
 #define USG
 
 #define HAVE_TERMIO
-
-/* This is the amount to subtract from u.u_ar0
-   to get the offset in the core file of the register values.  */
-
-#define KERNEL_U_ADDR 0xe0000000
diff --git a/gdb/config/vax/nm-vax.h b/gdb/config/vax/nm-vax.h
index 2518047..b1d73b6 100644
--- a/gdb/config/vax/nm-vax.h
+++ b/gdb/config/vax/nm-vax.h
@@ -20,6 +20,10 @@
 
 #define AP_REGNUM 12	/* XXXJRT */
 
+/* This is the amount to subtract from u.u_ar0
+   to get the offset in the core file of the register values.  */
+#define KERNEL_U_ADDR (0x80000000 - (UPAGES * NBPG))
+
 #define REGISTER_U_ADDR(addr, blockend, regno)		\
 { addr = blockend - 0110 + regno * 4;			\
   if (regno == PC_REGNUM) addr = blockend - 8;		\
diff --git a/gdb/config/vax/xm-vax.h b/gdb/config/vax/xm-vax.h
index d1057a8..c859c0a 100644
--- a/gdb/config/vax/xm-vax.h
+++ b/gdb/config/vax/xm-vax.h
@@ -18,11 +18,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* This is the amount to subtract from u.u_ar0
-   to get the offset in the core file of the register values.  */
-
-#define KERNEL_U_ADDR (0x80000000 - (UPAGES * NBPG))
-
 /* Kernel is a bit tenacious about sharing text segments, disallowing bpts.  */
 #define	ONE_PROCESS_WRITETEXT