* i386-tdep.h (i386fbsd_sigtramp_start, i386fbsd_sigtramp_end,

i386obsd_sigtramp_start, i386obsd_sigtramp_end,
i386fbsd4_sc_reg_offset, i386fbsd_sc_reg_offset,
i386nbsd_sc_reg_offset, i386obsd_sc_reg_offset,
i386bsd_sc_reg_offset): Add extern declarations.
* i386obsd-nat.c: Include "i386-tdep.h"
(_initialize_i386obsd_nat): Remove extern declarations.
* i386fbsd-nat.c (_initialize_i386fbsd_nat): Remove extern
declarations.
* i386bsd-nat.c (_initialize_i386bsd_nat): Remove extern
declarations.

4 files changed, 17 insertions, 14 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8a7ce98ca25..783c6f16f1a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,17 @@
 2003-08-10  Mark Kettenis  <kettenis@gnu.org>
 
+	* i386-tdep.h (i386fbsd_sigtramp_start, i386fbsd_sigtramp_end,
+	i386obsd_sigtramp_start, i386obsd_sigtramp_end,
+	i386fbsd4_sc_reg_offset, i386fbsd_sc_reg_offset,
+	i386nbsd_sc_reg_offset, i386obsd_sc_reg_offset,
+	i386bsd_sc_reg_offset): Add extern declarations.
+	* i386obsd-nat.c: Include "i386-tdep.h"
+	(_initialize_i386obsd_nat): Remove extern declarations.
+	* i386fbsd-nat.c (_initialize_i386fbsd_nat): Remove extern
+	declarations.
+	* i386bsd-nat.c (_initialize_i386bsd_nat): Remove extern
+	declarations.
+
 	* i386-tdep.c (i386_register_to_value): Use get_frame_register
 	instead of frame_read_register.
 	(i386_fetch_pointer_argument): Use get_frame_register_unsigned
diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index cd94a21c532..0fc66fc6ccf 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -1,5 +1,5 @@
 /* Native-dependent code for modern i386 BSD's.
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -395,19 +395,14 @@ _initialize_i386bsd_nat (void)
      information.  */
 
 #if defined (__FreeBSD_version) && __FreeBSD_version >= 400011
-  extern int i386fbsd4_sc_reg_offset[];
 #define SC_REG_OFFSET i386fbsd4_sc_reg_offset
 #elif defined (__FreeBSD_version) && __FreeBSD_version >= 300005
-  extern int i386fbsd_sc_reg_offset[];
 #define SC_REG_OFFSET i386fbsd_sc_reg_offset
 #elif defined (NetBSD) || defined (__NetBSD_Version__)
-  extern int i386nbsd_sc_reg_offset[];
 #define SC_REG_OFFSET i386nbsd_sc_reg_offset
 #elif defined (OpenBSD)
-  extern int i386obsd_sc_reg_offset[];
 #define SC_REG_OFFSET i386obsd_sc_reg_offset
 #else
-  extern int i386bsd_sc_reg_offset[];
 #define SC_REG_OFFSET i386bsd_sc_reg_offset
 #endif
 
diff --git a/gdb/i386fbsd-nat.c b/gdb/i386fbsd-nat.c
index f5845e309b3..7feb7b053e6 100644
--- a/gdb/i386fbsd-nat.c
+++ b/gdb/i386fbsd-nat.c
@@ -1,5 +1,5 @@
 /* Native-dependent code for FreeBSD/i386.
-   Copyright 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -93,9 +93,6 @@ _initialize_i386fbsd_nat (void)
     int ps_strings;
     size_t len;
 
-    extern CORE_ADDR i386fbsd_sigtramp_start;
-    extern CORE_ADDR i386fbsd_sigtramp_end;
-
     mib[0] = CTL_KERN;
     mib[1] = KERN_PS_STRINGS;
     len = sizeof (ps_strings);
diff --git a/gdb/i386obsd-nat.c b/gdb/i386obsd-nat.c
index b2cdc2a7e58..b0d4e033b8d 100644
--- a/gdb/i386obsd-nat.c
+++ b/gdb/i386obsd-nat.c
@@ -1,5 +1,5 @@
 /* Native-dependent code for OpenBSD/i386.
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,6 +23,8 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 
+#include "i386-tdep.h"
+
 /* Prevent warning from -Wmissing-prototypes.  */
 void _initialize_i386obsd_nat (void);
 
@@ -44,9 +46,6 @@ _initialize_i386obsd_nat (void)
     int mib[2];
     size_t len;
 
-    extern CORE_ADDR i386obsd_sigtramp_start;
-    extern CORE_ADDR i386obsd_sigtramp_end;
-
     mib[0] = CTL_VM;
     mib[1] = VM_PSSTRINGS;
     len = sizeof (_ps);