* Makefile.in (sparc_tdep_h): New.

	(sparc-linux-nat.o, sparc-nat.o, sparc-tdep.o, sparc64nbsd-nat.o)
	(sparcnbsd-nat.o, sparcnbsd-tdep.o): Depend on $(sparc_tdep_h).
	* sparc-linux-nat.c: Include "sparc-tdep.h".
	* sparc-nat.c: Likewise.
	* sparc-tdep.c: Likewise.
	* sparc64nbsd-nat.c: Likewise.
	* sparcnbsd-nat.c: Likewise.
	* sparcnbsd-tdep.c: Likewise.
	* sparc-tdep.h: New file.
	* config/sparc/tm-sparc.h: Remove prototypes for sparc_y_regnum
	and sparc_npc_regnum.

10 files changed, 57 insertions, 11 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 27481e2..f64ebaf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,20 @@
 2003-07-07  Daniel Jacobowitz  <drow@mvista.com>
 
+	* Makefile.in (sparc_tdep_h): New.
+	(sparc-linux-nat.o, sparc-nat.o, sparc-tdep.o, sparc64nbsd-nat.o)
+	(sparcnbsd-nat.o, sparcnbsd-tdep.o): Depend on $(sparc_tdep_h).
+	* sparc-linux-nat.c: Include "sparc-tdep.h".
+	* sparc-nat.c: Likewise.
+	* sparc-tdep.c: Likewise.
+	* sparc64nbsd-nat.c: Likewise.
+	* sparcnbsd-nat.c: Likewise.
+	* sparcnbsd-tdep.c: Likewise.
+	* sparc-tdep.h: New file.
+	* config/sparc/tm-sparc.h: Remove prototypes for sparc_y_regnum
+	and sparc_npc_regnum.
+
+2003-07-07  Daniel Jacobowitz  <drow@mvista.com>
+
 	* mips-linux-nat.c (mips_linux_cannot_fetch_register)
 	(mips_linux_cannot_store_register): List supported instead of
 	unsupported registers.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 3f83118..2ae35cb 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -734,6 +734,7 @@ solib_h = solib.h
 solist_h = solist.h
 somsolib_h = somsolib.h
 source_h = source.h
+sparc_tdep_h = sparc-tdep.h
 sparcnbsd_tdep_h = sparcnbsd-tdep.h
 srec_h = srec.h
 stabsread_h = stabsread.h
@@ -2256,15 +2257,17 @@ source.o: source.c $(defs_h) $(symtab_h) $(expression_h) $(language_h) \
 	$(gdb_string_h) $(gdb_stat_h) $(gdbcore_h) $(gdb_regex_h) \
 	$(symfile_h) $(objfiles_h) $(annotate_h) $(gdbtypes_h) $(linespec_h) \
 	$(filenames_h) $(completer_h) $(ui_out_h) $(readline_h)
-sparc-linux-nat.o: sparc-linux-nat.c $(defs_h) $(regcache_h) $(gregset_h)
+sparc-linux-nat.o: sparc-linux-nat.c $(defs_h) $(regcache_h) $(sparc_tdep_h) \
+	$(gregset_h)
 sparc-nat.o: sparc-nat.c $(defs_h) $(inferior_h) $(target_h) $(gdbcore_h) \
-	$(regcache_h) $(gdb_wait_h)
+	$(regcache_h) $(sparc_tdep_h) $(gdb_wait_h)
 sparc-stub.o: sparc-stub.c
 sparc-tdep.o: sparc-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) $(inferior_h) \
 	$(target_h) $(value_h) $(bfd_h) $(gdb_string_h) $(regcache_h) \
-	$(osabi_h) $(gregset_h) $(gdbcore_h) $(gdb_assert_h) $(symfile_h)
+	$(osabi_h) $(gregset_h) $(gdbcore_h) $(gdb_assert_h) $(symfile_h) \
+	$(sparc_tdep_h)
 sparc64nbsd-nat.o: sparc64nbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
-	$(sparcnbsd_tdep_h)
+	$(sparcnbsd_tdep_h) $(sparc_tdep_h)
 sparcl-stub.o: sparcl-stub.c
 sparcl-tdep.o: sparcl-tdep.c $(defs_h) $(gdbcore_h) $(breakpoint_h) \
 	$(target_h) $(serial_h) $(regcache_h)
@@ -2273,10 +2276,10 @@ sparclet-rom.o: sparclet-rom.c $(defs_h) $(gdbcore_h) $(target_h) \
 	$(regcache_h)
 sparclet-stub.o: sparclet-stub.c
 sparcnbsd-nat.o: sparcnbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
-	$(sparcnbsd_tdep_h)
+	$(sparcnbsd_tdep_h) $(sparc_tdep_h)
 sparcnbsd-tdep.o: sparcnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) \
 	$(target_h) $(value_h) $(osabi_h) $(sparcnbsd_tdep_h) $(nbsd_tdep_h) \
-	$(solib_svr4_h)
+	$(solib_svr4_h) $(sparc_tdep_h)
 stabsread.o: stabsread.c $(defs_h) $(gdb_string_h) $(bfd_h) $(gdb_obstack_h) \
 	$(symtab_h) $(gdbtypes_h) $(expression_h) $(symfile_h) $(objfiles_h) \
 	$(aout_stab_gnu_h) $(libaout_h) $(aout_aout64_h) $(gdb_stabs_h) \
diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h
index ec60c79..e40f52e 100644
--- a/gdb/config/sparc/tm-sparc.h
+++ b/gdb/config/sparc/tm-sparc.h
@@ -316,8 +316,6 @@ extern int sparc_prologue_frameless_p (CORE_ADDR);
 
 /* Multi-arch the nPC and Y registers.  */
 #define Y_REGNUM              (sparc_y_regnum ())
-extern int sparc_npc_regnum (void);
-extern int sparc_y_regnum (void);
 
 #endif /* GDB_MULTI_ARCH */
 
diff --git a/gdb/sparc-linux-nat.c b/gdb/sparc-linux-nat.c
index ba418b6..261ed60 100644
--- a/gdb/sparc-linux-nat.c
+++ b/gdb/sparc-linux-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for GNU/Linux SPARC.
 
-   Copyright 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,6 +21,7 @@
 
 #include "defs.h"
 #include "regcache.h"
+#include "sparc-tdep.h"
    
 #include <sys/procfs.h>
 
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index 33145e0..540bbcc 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -26,6 +26,8 @@
 #include "gdbcore.h"
 #include "regcache.h"
 
+#include "sparc-tdep.h"
+
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index fb77043..0d1b47b 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -34,6 +34,8 @@
 #include "regcache.h"
 #include "osabi.h"
 
+#include "sparc-tdep.h"
+
 #ifdef	USE_PROC_FS
 #include <sys/procfs.h>
 /* Prototypes for supply_gregset etc. */
diff --git a/gdb/sparc-tdep.h b/gdb/sparc-tdep.h
new file mode 100644
index 0000000..7c119b4
--- /dev/null
+++ b/gdb/sparc-tdep.h
@@ -0,0 +1,22 @@
+/* Target-dependent code for the SPARC for GDB, the GNU debugger.
+
+   Copyright 2003 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.  */
+
+extern int sparc_y_regnum (void);
diff --git a/gdb/sparc64nbsd-nat.c b/gdb/sparc64nbsd-nat.c
index a991d0e..1e68d69 100644
--- a/gdb/sparc64nbsd-nat.c
+++ b/gdb/sparc64nbsd-nat.c
@@ -1,5 +1,5 @@
 /* Native-dependent code for UltraSPARC systems running NetBSD.
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2003 Free Software Foundation, Inc.
    Contributed by Wasabi Systems, Inc.
 
    This file is part of GDB.
@@ -23,6 +23,7 @@
 #include "inferior.h"
 #include "regcache.h"
 
+#include "sparc-tdep.h"
 #include "sparcnbsd-tdep.h"
 
 #include <sys/types.h>
diff --git a/gdb/sparcnbsd-nat.c b/gdb/sparcnbsd-nat.c
index ce5d44d..f63d9e5 100644
--- a/gdb/sparcnbsd-nat.c
+++ b/gdb/sparcnbsd-nat.c
@@ -1,5 +1,5 @@
 /* Native-dependent code for SPARC systems running NetBSD.
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2003 Free Software Foundation, Inc.
    Contributed by Wasabi Systems, Inc.
 
    This file is part of GDB.
@@ -23,6 +23,7 @@
 #include "inferior.h"
 #include "regcache.h"
 
+#include "sparc-tdep.h"
 #include "sparcnbsd-tdep.h"
 
 #include <sys/types.h>
diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c
index 4fe05aa..6cd0e3f 100644
--- a/gdb/sparcnbsd-tdep.c
+++ b/gdb/sparcnbsd-tdep.c
@@ -28,6 +28,7 @@
 
 #include "gdb_string.h"
 
+#include "sparc-tdep.h"
 #include "sparcnbsd-tdep.h"
 #include "nbsd-tdep.h"