From 0fc93e6bc4c952b0eaf3e9c22bb55b33a636e2bd Mon Sep 17 00:00:00 2001
From: "J.T. Conklin" <jtc@acorntoolworks.com>
Date: Thu, 7 Sep 2000 20:08:40 +0000
Subject: [PATCH] * config/i386/nbsd.mt (TDEPFILES): Add i386nbsd-tdep.o. *
 i386nbsd-nat.c (i386nbsd_use_struct_convention): Moved from here. *
 i386nbsd-tdep.c (i386nbsd_use_struct_convention): To here. * i386nbsd-tdep.c:
 New file.

---
 gdb/ChangeLog           |  7 +++++++
 gdb/config/i386/nbsd.mt |  2 +-
 gdb/i386nbsd-nat.c      |  9 ---------
 gdb/i386nbsd-tdep.c     | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 gdb/i386nbsd-tdep.c

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 11192607183..6e039cff8a6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-07  J.T. Conklin  <jtc@redback.com>
+
+	* config/i386/nbsd.mt (TDEPFILES): Add i386nbsd-tdep.o.
+	* i386nbsd-nat.c (i386nbsd_use_struct_convention): Moved from here.
+	* i386nbsd-tdep.c (i386nbsd_use_struct_convention): To here.
+	* i386nbsd-tdep.c: New file.
+
 2000-09-07  Kevin Buettner  <kevinb@redhat.com>
 
 	* i386mach-nat.c (fetch_inferior_registers, fetch_core_registers):
diff --git a/gdb/config/i386/nbsd.mt b/gdb/config/i386/nbsd.mt
index 7564b73fe27..aede1c397ef 100644
--- a/gdb/config/i386/nbsd.mt
+++ b/gdb/config/i386/nbsd.mt
@@ -1,5 +1,5 @@
 # Target: Intel 386 running NetBSD
-TDEPFILES= i386-tdep.o i387-tdep.o
+TDEPFILES= i386-tdep.o i387-tdep.o i386nbsd-tdep.o
 TM_FILE= tm-nbsd.h
 
 GDBSERVER_DEPFILES= low-nbsd.o
diff --git a/gdb/i386nbsd-nat.c b/gdb/i386nbsd-nat.c
index b60ff32a2ed..0c069d12e60 100644
--- a/gdb/i386nbsd-nat.c
+++ b/gdb/i386nbsd-nat.c
@@ -147,15 +147,6 @@ store_inferior_registers (int regno)
 	  (PTRACE_ARG3_TYPE) &inferior_fpregisters, 0);
 }
 
-int
-i386nbsd_use_struct_convention (int gcc_p, struct type *type)
-{
-  return !(TYPE_LENGTH (type) == 1
-	   || TYPE_LENGTH (type) == 2
-	   || TYPE_LENGTH (type) == 4
-	   || TYPE_LENGTH (type) == 8);
-}
-
 struct md_core
 {
   struct reg intreg;
diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c
new file mode 100644
index 00000000000..4dfa6272371
--- /dev/null
+++ b/gdb/i386nbsd-tdep.c
@@ -0,0 +1,40 @@
+/* Target-dependent code for NetBSD/i386, for GDB.
+   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 2000
+   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.  */
+
+#include "defs.h"
+#include "gdbtypes.h"
+#if 0
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+#include <machine/frame.h>
+#include "inferior.h"
+#include "gdbcore.h" /* for registers_fetched() */
+#endif
+
+int
+i386nbsd_use_struct_convention (int gcc_p, struct type *type)
+{
+  return !(TYPE_LENGTH (type) == 1
+	   || TYPE_LENGTH (type) == 2
+	   || TYPE_LENGTH (type) == 4
+	   || TYPE_LENGTH (type) == 8);
+}