* 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.

1 files changed, 2 insertions, 24 deletions

diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
index 7cb9dea..f082f32 100644
--- a/gdb/m68klinux-nat.c
+++ b/gdb/m68klinux-nat.c
@@ -92,16 +92,6 @@ int have_ptrace_getregs =
 
 
 
-/* BLOCKEND is the value of u.u_ar0, and points to the place where GS
-   is stored.  */
-
-int
-m68k_linux_register_u_addr (int blockend, int regnum)
-{
-  return (blockend + 4 * regmap[regnum]);
-}
-
-
 /* Fetching registers directly from the U area, one at a time.  */
 
 /* FIXME: This duplicates code from `inptrace.c'.  The problem is that we
@@ -127,7 +117,6 @@ fetch_register (int regno)
   CORE_ADDR regaddr;
   char mess[128];		/* For messages */
   int i;
-  unsigned int offset;		/* Offset of registers within the u area.  */
   char buf[MAX_REGISTER_SIZE];
   int tid;
 
@@ -143,9 +132,7 @@ fetch_register (int regno)
   if (tid == 0)
     tid = PIDGET (inferior_ptid);	/* no thread id, just use process id */
 
-  offset = U_REGS_OFFSET;
-
-  regaddr = register_addr (regno, offset);
+  regaddr = 4 * regmap[regno];
   for (i = 0; i < register_size (current_gdbarch, regno);
        i += sizeof (PTRACE_TYPE_RET))
     {
@@ -192,7 +179,6 @@ store_register (int regno)
   CORE_ADDR regaddr;
   char mess[128];		/* For messages */
   int i;
-  unsigned int offset;		/* Offset of registers within the u area.  */
   int tid;
   char buf[MAX_REGISTER_SIZE];
 
@@ -206,9 +192,7 @@ store_register (int regno)
   if (tid == 0)
     tid = PIDGET (inferior_ptid);	/* no thread id, just use process id */
 
-  offset = U_REGS_OFFSET;
-
-  regaddr = register_addr (regno, offset);
+  regaddr = 4 * regmap[regno];
 
   /* Put the contents of regno into a local buffer */
   regcache_raw_collect (current_regcache, regno, buf);
@@ -595,12 +579,6 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
 }
 
 
-int
-kernel_u_size (void)
-{
-  return (sizeof (struct user));
-}
-
 /* Register that we are able to handle GNU/Linux ELF core file
    formats.  */