5 files changed, 12 insertions, 67 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7e4f498a394..3d315ded8e6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-12  Mark Kettenis  <kettenis@gnu.org>
+
+	* i386bsd-nat.c: Update copyright year.  Don't include
+	<sys/param.h> and <sys/user.h>.
+	(register_u_addr, kernel_u_size): Remove functions.
+	* config/i386/obsd.mh (NAT_FILE): Remove.
+	* config/i386/obsdaout.mh (NAT_FILE): Set to solib.h.
+	* config/i386/nm-obsd.h: Remove file.
+
 2005-01-12  Andrew Cagney  <cagney@gnu.org>
 
 	* exceptions.c: Include "gdb_string.h".
diff --git a/gdb/config/i386/nm-obsd.h b/gdb/config/i386/nm-obsd.h
deleted file mode 100644
index 571fb5984be..00000000000
--- a/gdb/config/i386/nm-obsd.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Native-dependent definitions for OpenBSD/i386.
-
-   Copyright 2001, 2004 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_OBSD_H
-#define NM_OBSD_H
-
-/* Get generic BSD native definitions.  */
-#include "config/nm-bsd.h"
-
-/* Support for the user struct.  */
-
-/* Return the size of the user struct.  */
-
-#define KERNEL_U_SIZE kernel_u_size ()
-extern int kernel_u_size (void);
-
-
-/* Shared library support.  */
-
-#include "solib.h"
-
-#endif /* nm-obsd.h */
diff --git a/gdb/config/i386/obsd.mh b/gdb/config/i386/obsd.mh
index f5b4b2dffc7..d1e96be5e78 100644
--- a/gdb/config/i386/obsd.mh
+++ b/gdb/config/i386/obsd.mh
@@ -1,6 +1,5 @@
 # Host: OpenBSD/i386 ELF
 NATDEPFILES= fork-child.o inf-ptrace.o \
 	i386bsd-nat.o i386obsd-nat.o i386nbsd-nat.o bsd-kvm.o
-NAT_FILE= nm-obsd.h
 
 LOADLIBES= -lkvm
diff --git a/gdb/config/i386/obsdaout.mh b/gdb/config/i386/obsdaout.mh
index 4124c79bba0..20b975aa187 100644
--- a/gdb/config/i386/obsdaout.mh
+++ b/gdb/config/i386/obsdaout.mh
@@ -2,6 +2,6 @@
 NATDEPFILES= fork-child.o inf-ptrace.o \
 	i386bsd-nat.o i386nbsd-nat.o i386obsd-nat.o bsd-kvm.o \
 	solib.o solib-sunos.o
-NAT_FILE= nm-obsd.h
+NAT_FILE= solib.h
 
 LOADLIBES= -lkvm
diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index 349112a4ad0..97e330448a5 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -1,6 +1,7 @@
 /* Native-dependent code for modern i386 BSD's.
 
-   Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -330,30 +331,6 @@ i386bsd_dr_get_status (void)
 #endif /* PT_GETDBREGS */
 
 
-/* Support for the user struct.  */
-
-/* Return the address register REGNUM.  BLOCKEND is the value of
-   u.u_ar0, which should point to the registers.  */
-
-CORE_ADDR
-register_u_addr (CORE_ADDR blockend, int regnum)
-{
-  gdb_assert (regnum >= 0 && regnum < ARRAY_SIZE (i386bsd_r_reg_offset));
-
-  return blockend + i386bsd_r_reg_offset[regnum];
-}
-
-#include <sys/param.h>
-#include <sys/user.h>
-
-/* Return the size of the user struct.  */
-
-int
-kernel_u_size (void)
-{
-  return (sizeof (struct user));
-}
-
 void
 _initialize_i386bsd_nat (void)
 {