From 1fc7d51975862d94b9413cfbbb4fabf39a1faaa6 Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Mon, 31 May 2004 10:01:18 +0000
Subject: [PATCH] * i386bsd-nat.c: Don't include "gregset.h". (supply_gregset,
 fill_gregset): Make static. (supply_fpregset, fill_fpregset): Remove. *
 Makefile.in (i386bsd-nat.o): Update dependencies.

---
 gdb/ChangeLog     |  7 +++++++
 gdb/Makefile.in   |  2 +-
 gdb/i386bsd-nat.c | 25 +++----------------------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b6fce9f0f7d..c1fa9022bbb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-31  Mark Kettenis  <kettenis@gnu.org>
+
+	* i386bsd-nat.c: Don't include "gregset.h".
+	(supply_gregset, fill_gregset): Make static.
+	(supply_fpregset, fill_fpregset): Remove.
+	* Makefile.in (i386bsd-nat.o): Update dependencies.
+
 2004-05-30  Mark Kettenis  <kettenis@gnu.org>
 
 	* fbsd-proc.c: Include "regcache.h", "regset.h" and
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 681e9bd2e6c..ba25d03d4ca 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1855,7 +1855,7 @@ hpread.o: hpread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(hp_symtab_h) \
 hpux-thread.o: hpux-thread.c $(defs_h) $(gdbthread_h) $(target_h) \
 	$(inferior_h) $(regcache_h) $(gdb_stat_h) $(gdbcore_h)
 i386bsd-nat.o: i386bsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
-	$(gdb_assert_h) $(gregset_h) $(i386_tdep_h) $(i387_tdep_h)
+	$(gdb_assert_h) $(i386_tdep_h) $(i387_tdep_h)
 i386bsd-tdep.o: i386bsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \
 	$(gdbcore_h) $(regcache_h) $(osabi_h) $(gdb_string_h) $(i386_tdep_h)
 i386-cygwin-tdep.o: i386-cygwin-tdep.c $(defs_h) $(osabi_h) $(gdb_string_h) \
diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index ab4d14cd434..9b6056714a2 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -43,8 +43,8 @@ typedef struct reg gregset_t;
 typedef struct fpreg fpregset_t;
 #endif
 
-#include "gregset.h"
 #include "i386-tdep.h"
+#include "i387-tdep.h"
 
 
 /* In older BSD versions we cannot get at some of the segment
@@ -120,7 +120,7 @@ cannot_fetch_register (int regnum)
 /* Fill GDB's register array with the general-purpose register values
    in *GREGSETP.  */
 
-void
+static void
 supply_gregset (gregset_t *gregsetp)
 {
   struct regcache *regcache = current_regcache;
@@ -139,7 +139,7 @@ supply_gregset (gregset_t *gregsetp)
    *GREGSETPS with the value in GDB's register array.  If REGNUM is -1,
    do this for all registers.  */
 
-void
+static void
 fill_gregset (gregset_t *gregsetp, int regnum)
 {
   struct regcache *regcache = current_regcache;
@@ -150,26 +150,7 @@ fill_gregset (gregset_t *gregsetp, int regnum)
       regcache_raw_collect (regcache, i, REG_ADDR (gregsetp, i));
 }
 
-#include "i387-tdep.h"
-
-/* Fill GDB's register array with the floating-point register values
-   in *FPREGSETP.  */
 
-void
-supply_fpregset (fpregset_t *fpregsetp)
-{
-  i387_supply_fsave (current_regcache, -1, fpregsetp);
-}
-
-/* Fill register REGNUM (if it is a floating-point register) in
-   *FPREGSETP with the value in GDB's register array.  If REGNUM is
-   -1, do this for all registers.  */
-
-void
-fill_fpregset (fpregset_t *fpregsetp, int regnum)
-{
-  i387_collect_fsave (current_regcache, regnum, fpregsetp);
-}
 
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers (including the floating point registers).  */
-- 
2.30.2