* config/nm-nbsd.h (link_object, lo_name, etc): Move to here

 	from config/nm-nbsd.h.
	* config/sparc/nm-nbsd.h (regs, fp_status, etc): Move to here
	from config/sparc/tm-nbsd.h.

4 files changed, 30 insertions, 77 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e40e124..55c1e64 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 Tue Mar  5 18:54:04 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
+	* config/nm-nbsd.h (link_object, lo_name, etc): Move to here
+ 	from config/nm-nbsd.h.
+	* config/sparc/nm-nbsd.h (regs, fp_status, etc): Move to here
+	from config/sparc/tm-nbsd.h.
+
 	* config/m68k/nm-hp300hpux.h (FIVE_ARG_PTRACE): Define here
 	instead of in config/m68k/xm-hp300hpux.h.
 
diff --git a/gdb/config/sparc/nm-nbsd.h b/gdb/config/sparc/nm-nbsd.h
index 0ab5c1a..016772a 100644
--- a/gdb/config/sparc/nm-nbsd.h
+++ b/gdb/config/sparc/nm-nbsd.h
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define NM_NBSD_H
 
 /* Get generic NetBSD native definitions. */
+
 #include "nm-nbsd.h"
 
 #define FETCH_INFERIOR_REGISTERS
@@ -30,4 +31,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES)
 
+/* Make things match up with what is expected in sparc-nat.c.  */
+
+#define regs		trapframe
+#define fp_status	fpstate
+
+#define r_g1		tf_global[1]
+#define r_ps		tf_psr
+#define r_pc		tf_pc
+#define r_npc		tf_npc
+#define r_y		tf_y
+
+#define fpu		fpstate
+#define fpu_regs	fs_regs
+#define fpu_fsr		fs_fsr
+#define fpu_fr		fs_regs
+#define Fpu_fsr		fs_fsr
+#define FPU_FSR_TYPE	int
+
+#define PTRACE_GETREGS	 PT_GETREGS
+#define PTRACE_GETFPREGS PT_GETFPREGS
+#define PTRACE_SETREGS	 PT_SETREGS
+#define PTRACE_SETFPREGS PT_SETFPREGS
+
 #endif /* NM_NBSD_H */
diff --git a/gdb/config/sparc/tm-nbsd.h b/gdb/config/sparc/tm-nbsd.h
index 1231728..1a31084 100644
--- a/gdb/config/sparc/tm-nbsd.h
+++ b/gdb/config/sparc/tm-nbsd.h
@@ -21,28 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define TM_NBSD_H
 
 #include "sparc/tm-sparc.h"
-#include "tm-nbsd.h"
 
-/* make things match up with what is expected in sparc-nat.c */
-#define regs		trapframe
-#define fp_status	fpstate
-
-#define r_g1		tf_global[1]
-#define r_ps		tf_psr
-#define r_pc		tf_pc
-#define r_npc		tf_npc
-#define r_y		tf_y
-
-#define fpu		fpstate
-#define fpu_regs	fs_regs
-#define fpu_fsr		fs_fsr
-#define fpu_fr		fs_regs
-#define Fpu_fsr		fs_fsr
-#define FPU_FSR_TYPE	int
-
-#define PTRACE_GETREGS	 PT_GETREGS
-#define PTRACE_GETFPREGS PT_GETFPREGS
-#define PTRACE_SETREGS	 PT_SETREGS
-#define PTRACE_SETFPREGS PT_SETFPREGS
+#include "tm-nbsd.h"
 
 #endif /* TM_NBSD_H */
diff --git a/gdb/config/tm-nbsd.h b/gdb/config/tm-nbsd.h
index 0c34892..e295d85 100644
--- a/gdb/config/tm-nbsd.h
+++ b/gdb/config/tm-nbsd.h
@@ -17,58 +17,3 @@ 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.  */
-
-#include "solib.h"      /* Support for shared libraries. */
-
-/* make structure definitions match up with those expected in solib.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