* core-aout.c: Delete file.

	* Makefile.in (ALLDEPFILES): Remove core-aout.c.
	(core-aout.o): Delete rule.
	* gdbcore.h (kernel_u_addr, KERNEL_U_ADDR): Remove.

        * config/alpha/nm-linux.h (U_REGS_OFFSET): Remove.

        * arm-linux-nat.c (arm_linux_kernel_u_size): Remove.
        * config/arm/nm-linux.h (U_REGS_OFFSET, KERNEL_U_SIZE,
        KERNEL_U_ADDR): Remove.

        * i386-linux-nat.c (register_u_addr, kernel_u_size): Remove.
        (cannot_fetch_register, cannot_store_register): Remove.
        (fetch_register): Inline cannot_fetch_register and register_addr.
        (store_register): Inline cannot_store_register and register_addr.
        * config/i386/linux.mh (NATDEPFILES): Remove core-aout.o.
        * config/i386/nm-linux.h (KERNEL_U_SIZE, KERNEL_U_ADDR,
        REGISTER_U_ADDR, CANNOT_FETCH_REGISTER, CANNOT_STORE_REGISTER):
        Remove.

        * m68klinux-nat.c (m68k_linux_register_u_addr, kernel_u_size): Remove.
        (fetch_register): Inline register_addr.
        (store_register): Inline register_addr.
        * config/m68k/linux.mh (NATDEPFILES): Remove core-aout.o.
        * config/m68k/nm-linux.h (KERNEL_U_SIZE, KERNEL_U_ADDR,
        U_REGS_OFFSET, REGISTER_U_ADDR): Remove.

        * config/mips/nm-irix5.h (REGISTER_U_ADDR): Remove.
        * config/mips/nm-linux.h (KERNEL_U_SIZE, U_REGS_OFFSET,
        REGISTER_U_ADDR): Remove.

        * hppa-linux-nat.c (register_addr): Rename to ...
        (hppa_linux_register_addr): ... this.  Make static.
        (fetch_register, store_register): Adapt callers.
        * config/pa/nm-linux.h (U_REGS_OFFSET): Remove.

        * ppc-linux-nat.c (kernel_u_size): Remove.
        * config/powerpc/nm-linux.h (KERNEL_U_SIZE, KERNEL_U_ADDR): Remove.

	* vax-nat.c (vax_kernel_u_addr, vax_register_u_addr): Make static.
	* config/vax/vax.mh (NATDEPFILES): Remove core-aout.o.
	(NAT_FILE): Remove.
	* config/vax/nm-vax.h: Delete file.

12 files changed, 3 insertions, 121 deletions

diff --git a/gdb/config/alpha/nm-linux.h b/gdb/config/alpha/nm-linux.h
index 9fe362c..97811f7 100644
--- a/gdb/config/alpha/nm-linux.h
+++ b/gdb/config/alpha/nm-linux.h
@@ -25,10 +25,6 @@
 
 #include "config/nm-linux.h"
 
-/* ptrace register ``addresses'' are absolute.  */
-
-#define U_REGS_OFFSET 0
-
 /* Given a pointer to either a gregset_t or fpregset_t, return a
    pointer to the first register.  */
 #define ALPHA_REGSET_BASE(regsetp)  ((long *) (regsetp))
diff --git a/gdb/config/arm/nm-linux.h b/gdb/config/arm/nm-linux.h
index 0e2cdf5..97371d2 100644
--- a/gdb/config/arm/nm-linux.h
+++ b/gdb/config/arm/nm-linux.h
@@ -23,18 +23,6 @@
 
 #include "config/nm-linux.h"
 
-/* ptrace register ``addresses'' are absolute.  */
-
-#define U_REGS_OFFSET 0
-
-/* Return sizeof user struct to callers in less machine dependent routines */
-extern int kernel_u_size (void);
-#define KERNEL_U_SIZE	arm_linux_kernel_u_size()
-
-/* 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 0x0
-
 /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
 #define FETCH_INFERIOR_REGISTERS
 
diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh
index 62fff99..92c2d96 100644
--- a/gdb/config/i386/linux.mh
+++ b/gdb/config/i386/linux.mh
@@ -2,7 +2,7 @@
 
 NAT_FILE= nm-linux.h
 NATDEPFILES= inf-ptrace.o fork-child.o corelow.o \
-	core-aout.o i386-nat.o i386-linux-nat.o \
+	i386-nat.o i386-linux-nat.o \
 	proc-service.o linux-thread-db.o gcore.o \
 	linux-nat.o linux-fork.o
 
diff --git a/gdb/config/i386/nm-linux.h b/gdb/config/i386/nm-linux.h
index 4779026..8ee5696 100644
--- a/gdb/config/i386/nm-linux.h
+++ b/gdb/config/i386/nm-linux.h
@@ -29,20 +29,6 @@
 #include "i386/nm-i386.h"
 #include "config/nm-linux.h"
 
-/* Support for the user area.  */
-
-/* Return the size of the user struct.  */
-extern int kernel_u_size (void);
-#define KERNEL_U_SIZE kernel_u_size()
-
-/* This is the amount to substract from u.u_ar0 to get the offset in
-   the core file of the register values.  */
-#define KERNEL_U_ADDR 0
-
-extern CORE_ADDR register_u_addr (CORE_ADDR blockend, int regnum);
-#define REGISTER_U_ADDR(addr, blockend, regnum) \
-  (addr) = register_u_addr (blockend, regnum)
-
 /* Provide access to the i386 hardware debugging registers.  */
 
 extern void i386_linux_dr_set_control (unsigned long control);
@@ -65,15 +51,6 @@ extern unsigned long i386_linux_dr_get_status (void);
 /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'.  */
 #define FETCH_INFERIOR_REGISTERS
 
-/* Nevertheless, define CANNOT_{FETCH,STORE}_REGISTER, because we
-   might fall back on the code `infptrace.c' (well a copy of that code
-   in `i386-linux-nat.c' for now) and we can access only the
-   general-purpose registers in that way.  */
-extern int cannot_fetch_register (int regno);
-extern int cannot_store_register (int regno);
-#define CANNOT_FETCH_REGISTER(regno) cannot_fetch_register (regno)
-#define CANNOT_STORE_REGISTER(regno) cannot_store_register (regno)
-
 #ifdef HAVE_PTRACE_GETFPXREGS
 /* Include register set support for the SSE registers.  */
 #define FILL_FPXREGSET
diff --git a/gdb/config/m68k/linux.mh b/gdb/config/m68k/linux.mh
index 871632d..e77a6c5 100644
--- a/gdb/config/m68k/linux.mh
+++ b/gdb/config/m68k/linux.mh
@@ -2,7 +2,7 @@
 
 NAT_FILE= nm-linux.h
 NATDEPFILES= inf-ptrace.o fork-child.o \
-	corelow.o core-aout.o m68klinux-nat.o gcore.o \
+	corelow.o m68klinux-nat.o gcore.o \
 	proc-service.o linux-thread-db.o linux-nat.o linux-fork.o
 
 # The dynamically loaded libthread_db needs access to symbols in the
diff --git a/gdb/config/m68k/nm-linux.h b/gdb/config/m68k/nm-linux.h
index c02868e..7f5a427 100644
--- a/gdb/config/m68k/nm-linux.h
+++ b/gdb/config/m68k/nm-linux.h
@@ -23,22 +23,6 @@
 
 #include "config/nm-linux.h"
 
-/* Return sizeof user struct to callers in less machine dependent routines */
-
-#define KERNEL_U_SIZE kernel_u_size()
-extern int kernel_u_size (void);
-
-/* 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 0x0
-
-#define U_REGS_OFFSET 0
-
-#define REGISTER_U_ADDR(addr, blockend, regno) \
-	(addr) = m68k_linux_register_u_addr ((blockend),(regno));
-
-extern int m68k_linux_register_u_addr (int, int);
-
 /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'.  */
 #define FETCH_INFERIOR_REGISTERS
 
diff --git a/gdb/config/mips/nm-irix5.h b/gdb/config/mips/nm-irix5.h
index d775af1..6733fa5 100644
--- a/gdb/config/mips/nm-irix5.h
+++ b/gdb/config/mips/nm-irix5.h
@@ -49,9 +49,3 @@ extern int procfs_set_watchpoint (ptid_t, CORE_ADDR, int, int, int);
 
 #define TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT(SIZE) 1
 
-/* Override register locations in upage for SGI machines */
-#define REGISTER_U_ADDR(addr, blockend, regno) 		\
-  if (regno < PC_REGNUM)				\
-      addr = regno;					\
-  else							\
-      addr = regno + NSIG_HNDLRS;	/* Skip over signal handlers */
diff --git a/gdb/config/mips/nm-linux.h b/gdb/config/mips/nm-linux.h
index 8042316..81cfbfa 100644
--- a/gdb/config/mips/nm-linux.h
+++ b/gdb/config/mips/nm-linux.h
@@ -24,18 +24,6 @@
 
 #include "config/nm-linux.h"
 
-/* Return sizeof user struct to callers in less machine dependent
-   routines.  Hard coded for cross-compilation friendliness. */
-
-#define KERNEL_U_SIZE 504
-
-/* ptrace register ``addresses'' are absolute.  */
-
-#define U_REGS_OFFSET 0
-
-#define REGISTER_U_ADDR(addr, blockend, regno) \
-  (addr) = mips_register_addr ((regno),(blockend))
-
 int mips_linux_cannot_fetch_register (int regno);
 int mips_linux_cannot_store_register (int regno);
 #define CANNOT_FETCH_REGISTER(regno) mips_linux_cannot_fetch_register (regno)
diff --git a/gdb/config/pa/nm-linux.h b/gdb/config/pa/nm-linux.h
index cfe0974..b6023b4 100644
--- a/gdb/config/pa/nm-linux.h
+++ b/gdb/config/pa/nm-linux.h
@@ -23,8 +23,6 @@
 
 #include "config/nm-linux.h"
 
-#define U_REGS_OFFSET 0
-
 /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'.  */
 #define FETCH_INFERIOR_REGISTERS
 
diff --git a/gdb/config/powerpc/nm-linux.h b/gdb/config/powerpc/nm-linux.h
index 8678c2c..5d367f6 100644
--- a/gdb/config/powerpc/nm-linux.h
+++ b/gdb/config/powerpc/nm-linux.h
@@ -23,15 +23,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NM_LINUX_H
 
-/* Return sizeof user struct to callers in less machine dependent routines */
-
-#define KERNEL_U_SIZE kernel_u_size()
-extern int kernel_u_size (void);
-
-/* 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 0x0
-
 #define FETCH_INFERIOR_REGISTERS
 
 #endif /* #ifndef NM_LINUX_H */
diff --git a/gdb/config/vax/nm-vax.h b/gdb/config/vax/nm-vax.h
deleted file mode 100644
index c0bf2b0..0000000
--- a/gdb/config/vax/nm-vax.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Native-dependent definitions for VAXen under 4.2 BSD and ULTRIX.
-
-   Copyright 1986, 1987, 1989, 1992, 2004, 2007 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef NM_VAX_H
-#define NM_VAX_H
-
-extern CORE_ADDR vax_kernel_u_addr;
-#define KERNEL_U_ADDR vax_kernel_u_addr
-
-extern CORE_ADDR vax_register_u_addr (CORE_ADDR u_ar0, int regnum);
-#define REGISTER_U_ADDR(addr, u_ar0, regnum) \
-  (addr) = vax_register_u_addr (u_ar0, regnum)
-
-#endif /* nm-vax.h */
diff --git a/gdb/config/vax/vax.mh b/gdb/config/vax/vax.mh
index 46b85d1..69c548d 100644
--- a/gdb/config/vax/vax.mh
+++ b/gdb/config/vax/vax.mh
@@ -1,4 +1,2 @@
 # Host: VAX running 4.2BSD or Ultrix
-NATDEPFILES= vax-nat.o fork-child.o inf-ptrace.o \
-	corelow.o core-aout.o
-NAT_FILE= nm-vax.h
+NATDEPFILES= vax-nat.o fork-child.o inf-ptrace.o corelow.o