* config/sparc/nbsdaout.mh (NAT_FILE): Set to solib.h.

* config/sparc/nbsdelf.mh (NAT_FILE): Remove variable.
* config/sparc/nm-nbsd.h: Remove file.
* config/sparc/nm-nbsdaout.h: Remove file.

gdb/ChangeLog

 2004-11-29  Mark Kettenis  <kettenis@gnu.org>
+	* config/sparc/nbsdaout.mh (NAT_FILE): Set to solib.h.
+	* config/sparc/nbsdelf.mh (NAT_FILE): Remove variable.
+	* config/sparc/nm-nbsd.h: Remove file.
+	* config/sparc/nm-nbsdaout.h: Remove file.
+
 	* sparc-nat.c (inf_ptrace_xfer_partial): New variable.
 	(sparc_xfer_partial): New function.
 	(sparc_target): Save value of to_xfer_partial from ptrace vector.

gdb/config/sparc/nbsdaout.mh

 # Host: NetBSD/sparc a.out
 NATDEPFILES= fork-child.o inf-ptrace.o \
 	sparc-nat.o sparcnbsd-nat.o bsd-kvm.o solib-sunos.o
-NAT_FILE= nm-nbsd.h
+NAT_FILE= solib.h
 
 LOADLIBES= -lkvm

gdb/config/sparc/nbsdelf.mh

 # Host: NetBSD/sparc ELF
 NATDEPFILES= fork-child.o inf-ptrace.o \
 	sparc-nat.o sparcnbsd-nat.o bsd-kvm.o
-NAT_FILE= nm-nbsd.h
 
 LOADLIBES= -lkvm

gdb/config/sparc/nm-nbsd.h

-/* Native-dependent definitions for NetBSD/sparc.
-
-   Copyright 1986, 1987, 1989, 1992, 1994, 1996, 1999, 2000, 2002,
-   2003, 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_NBSD_H
-#define NM_NBSD_H
-
-/* Get generic NetBSD native definitions.  */
-#include "config/nm-nbsd.h"
-
-
-/* Support for StackGhost cookies.  */
-
-#include "target.h"
-struct target_ops;	/* Fool ARI.  */
-
-#define NATIVE_XFER_WCOOKIE sparc_xfer_wcookie
-extern LONGEST sparc_xfer_wcookie (struct target_ops *ops,
-				   enum target_object object,
-				   const char *annex,
-				   void *readbuf, const void *writebuf,
-				   ULONGEST offset, LONGEST len);
-
-#endif /* nm-nbsd.h */

gdb/config/sparc/nm-nbsdaout.h

-/* Native-dependent definitions for NetBSD/sparc a.out.
-
-   Copyright 1999, 2003 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_NBSDAOUT_H
-#define NM_NBSDAOUT_H
-
-#include "sparc/nm-nbsd.h"
-
-/* Get generic NetBSD a.out native definitions.  */
-#include "config/nm-nbsdaout.h"
-
-#endif /* nm-nbsdaout.h */