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

* config/i386/nbsdelf.mh (NAT_FILE): Set to solib.h.
* config/i386/nm-nbsdaout.h: Remove file.
* config/i386/nm-fbsd.h (link_object, lo_name, lo_library)
(lo_unused, lo_major, lo_minor, lo_next, link_map, lm_addr)
(lm_name, lm_next, lm_lop, lm_lob, lm_rwt, lm_ld, lm_lpd)
(link_dynamic_2, ld_loaded, ld_need, ld_rules, ld_got, ld_plt)
(ld_rel, ld_hash, ld_stab, ld_stab_hash, ld_buckets, ld_symbols)
(ld_symb_size, ld_text, ld_plt_sz, rtc_symb, rtc_sp, rtc_next)
(ld_debug, ldd_version, ldd_in_debugger, ldd_sym_loaded)
(ldd_bp_addr, ldd_bp_inst, ldd_cp, link_dynamic, ld_version)
(ldd, ld_un, ld_2): Remove defines.
* config/i386/nm-obsd.h: Likewise.

6 files changed, 18 insertions, 143 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2a7c4da..7bd25a2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,19 @@
+2004-10-09  Mark Kettenis  <kettenis@gnu.org>
+
+	* config/i386/nbsdaout.mh (NAT_FILE): Set to solib.h.
+	* config/i386/nbsdelf.mh (NAT_FILE): Set to solib.h.
+	* config/i386/nm-nbsdaout.h: Remove file.
+	* config/i386/nm-fbsd.h (link_object, lo_name, lo_library)
+	(lo_unused, lo_major, lo_minor, lo_next, link_map, lm_addr)
+	(lm_name, lm_next, lm_lop, lm_lob, lm_rwt, lm_ld, lm_lpd)
+	(link_dynamic_2, ld_loaded, ld_need, ld_rules, ld_got, ld_plt)
+	(ld_rel, ld_hash, ld_stab, ld_stab_hash, ld_buckets, ld_symbols)
+	(ld_symb_size, ld_text, ld_plt_sz, rtc_symb, rtc_sp, rtc_next)
+	(ld_debug, ldd_version, ldd_in_debugger, ldd_sym_loaded)
+	(ldd_bp_addr, ldd_bp_inst, ldd_cp, link_dynamic, ld_version)
+	(ldd, ld_un, ld_2): Remove defines.
+	* config/i386/nm-obsd.h: Likewise.
+
 2004-10-09  Paul Hilfinger  <hilfingr@nile.gnat.com>
 
 	* ada-lex.l: Remove useless rule whose right-context clause
diff --git a/gdb/config/i386/nbsdaout.mh b/gdb/config/i386/nbsdaout.mh
index 9c3bfe4..1614c4d 100644
--- a/gdb/config/i386/nbsdaout.mh
+++ b/gdb/config/i386/nbsdaout.mh
@@ -2,6 +2,6 @@
 NATDEPFILES= fork-child.o inf-ptrace.o \
 	i386bsd-nat.o i386nbsd-nat.o bsd-kvm.o \
 	solib.o solib-sunos.o
-NAT_FILE= nm-nbsdaout.h
+NAT_FILE= solib.h
 
 LOADLIBES= -lkvm
diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh
index 7968de6..e49a49a 100644
--- a/gdb/config/i386/nbsdelf.mh
+++ b/gdb/config/i386/nbsdelf.mh
@@ -1,6 +1,6 @@
 # Host: NetBSD/i386 ELF
 NATDEPFILES= fork-child.o inf-ptrace.o \
 	i386bsd-nat.o i386nbsd-nat.o bsd-kvm.o
-NAT_FILE= config/nm-nbsd.h
+NAT_FILE= solib.h
 
 LOADLIBES= -lkvm
diff --git a/gdb/config/i386/nm-fbsd.h b/gdb/config/i386/nm-fbsd.h
index 1caff24..4c0aa36 100644
--- a/gdb/config/i386/nm-fbsd.h
+++ b/gdb/config/i386/nm-fbsd.h
@@ -68,59 +68,4 @@ extern int kernel_u_size (void);
 
 #include "solib.h"
 
-/* Make structure definitions match up with those expected in
-   `solib-sunos.c'.  */
-
-#define link_object	sod
-#define lo_name		sod_name
-#define lo_library	sod_library
-#define lo_unused	sod_reserved
-#define lo_major	sod_major
-#define lo_minor	sod_minor
-#define lo_next		sod_next
-
-#define link_map	so_map
-#define lm_addr		som_addr
-#define lm_name		som_path
-#define lm_next		som_next
-#define lm_lop		som_sod
-#define lm_lob		som_sodbase
-#define lm_rwt		som_write
-#define lm_ld		som_dynamic
-#define lm_lpd		som_spd
-
-#define link_dynamic_2	section_dispatch_table
-#define ld_loaded	sdt_loaded
-#define ld_need		sdt_sods
-#define ld_rules	sdt_filler1
-#define ld_got		sdt_got
-#define ld_plt		sdt_plt
-#define ld_rel		sdt_rel
-#define ld_hash		sdt_hash
-#define ld_stab		sdt_nzlist
-#define ld_stab_hash	sdt_filler2
-#define ld_buckets	sdt_buckets
-#define ld_symbols	sdt_strings
-#define ld_symb_size	sdt_str_sz
-#define ld_text		sdt_text_sz
-#define ld_plt_sz	sdt_plt_sz
-
-#define rtc_symb	rt_symbol
-#define rtc_sp		rt_sp
-#define rtc_next	rt_next
-
-#define ld_debug	so_debug
-#define ldd_version	dd_version
-#define ldd_in_debugger	dd_in_debugger
-#define ldd_sym_loaded	dd_sym_loaded
-#define ldd_bp_addr	dd_bpt_addr
-#define ldd_bp_inst	dd_bpt_shadow
-#define ldd_cp		dd_cc
-
-#define link_dynamic	_dynamic
-#define ld_version	d_version
-#define ldd		d_debug
-#define ld_un		d_un
-#define ld_2		d_sdt
-
 #endif /* nm-fbsd.h */
diff --git a/gdb/config/i386/nm-nbsdaout.h b/gdb/config/i386/nm-nbsdaout.h
deleted file mode 100644
index 81866ff..0000000
--- a/gdb/config/i386/nm-nbsdaout.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Native-dependent definitions for NetBSD/i386 a.out.
-
-   Copyright 1986, 1987, 1989, 1992, 1994, 1996, 2000, 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_NBSDAOUT_H
-#define NM_NBSDAOUT_H
-
-#include "config/nm-nbsd.h"
-
-/* Get generic NetBSD a.out native definitions.  */
-#include "config/nm-nbsdaout.h"
-
-#endif /* nm-nbsdaout.h */
diff --git a/gdb/config/i386/nm-obsd.h b/gdb/config/i386/nm-obsd.h
index 99d8b61..571fb59 100644
--- a/gdb/config/i386/nm-obsd.h
+++ b/gdb/config/i386/nm-obsd.h
@@ -37,59 +37,4 @@ extern int kernel_u_size (void);
 
 #include "solib.h"
 
-/* Make structure definitions match up with those expected in
-   `solib-sunos.c'.  */
-
-#define link_object	sod
-#define lo_name		sod_name
-#define lo_library	sod_library
-#define lo_unused	sod_reserved
-#define lo_major	sod_major
-#define lo_minor	sod_minor
-#define lo_next		sod_next
-
-#define link_map	so_map
-#define lm_addr		som_addr
-#define lm_name		som_path
-#define lm_next		som_next
-#define lm_lop		som_sod
-#define lm_lob		som_sodbase
-#define lm_rwt		som_write
-#define lm_ld		som_dynamic
-#define lm_lpd		som_spd
-
-#define link_dynamic_2	section_dispatch_table
-#define ld_loaded	sdt_loaded
-#define ld_need		sdt_sods
-#define ld_rules	sdt_filler1
-#define ld_got		sdt_got
-#define ld_plt		sdt_plt
-#define ld_rel		sdt_rel
-#define ld_hash		sdt_hash
-#define ld_stab		sdt_nzlist
-#define ld_stab_hash	sdt_filler2
-#define ld_buckets	sdt_buckets
-#define ld_symbols	sdt_strings
-#define ld_symb_size	sdt_str_sz
-#define ld_text		sdt_text_sz
-#define ld_plt_sz	sdt_plt_sz
-
-#define rtc_symb	rt_symbol
-#define rtc_sp		rt_sp
-#define rtc_next	rt_next
-
-#define ld_debug	so_debug
-#define ldd_version	dd_version
-#define ldd_in_debugger	dd_in_debugger
-#define ldd_sym_loaded	dd_sym_loaded
-#define ldd_bp_addr	dd_bpt_addr
-#define ldd_bp_inst	dd_bpt_shadow
-#define ldd_cp		dd_cc
-
-#define link_dynamic	_dynamic
-#define ld_version	d_version
-#define ldd		d_debug
-#define ld_un		d_un
-#define ld_2		d_sdt
-
 #endif /* nm-obsd.h */