* sparc-nat.h (sparc_fetch_inferior_registers): Add prototype.

	(sparc_store_inferior_registers): Likewise.
	* sparc-nat.c (fetch_inferior_registers): Rename to ...
	(sparc_fetch_inferior_registers): ... this.
	(store_inferior_registers): Rename to ...
	(sparc_store_inferior_registers): ... this.
	(sparc_target): Update callback names.
	* sparc-linux.nat.c (_initialize_sparc_linux_nat): Likewise.
	* sparc64-linux.nat.c (_initialize_sparc64_linux_nat): Likewise.

5 files changed, 23 insertions, 8 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aeccf2c..2f275e0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,17 @@
 2007-05-06  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* sparc-nat.h (sparc_fetch_inferior_registers): Add prototype.
+	(sparc_store_inferior_registers): Likewise.
+	* sparc-nat.c (fetch_inferior_registers): Rename to ...
+	(sparc_fetch_inferior_registers): ... this.
+	(store_inferior_registers): Rename to ...
+	(sparc_store_inferior_registers): ... this.
+	(sparc_target): Update callback names.
+	* sparc-linux.nat.c (_initialize_sparc_linux_nat): Likewise. 
+	* sparc64-linux.nat.c (_initialize_sparc64_linux_nat): Likewise. 
+
+2007-05-06  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* linux-nat.c (child_post_attach): Rename to ...
 	(linux_child_post_attach): ... this.  Make static.
 	(child_follow_fork): Rename to ...
diff --git a/gdb/sparc-linux-nat.c b/gdb/sparc-linux-nat.c
index 0f63ad6..afbccdf 100644
--- a/gdb/sparc-linux-nat.c
+++ b/gdb/sparc-linux-nat.c
@@ -65,8 +65,8 @@ _initialize_sparc_linux_nat (void)
   t = linux_target ();
 
   /* Add our register access methods.  */
-  t->to_fetch_registers = fetch_inferior_registers;
-  t->to_store_registers = store_inferior_registers;
+  t->to_fetch_registers = sparc_fetch_inferior_registers;
+  t->to_store_registers = sparc_store_inferior_registers;
 
   /* Register the target.  */
   linux_nat_add_target (t);
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index 268f868..e19de1b 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -135,7 +135,7 @@ sparc32_fpregset_supplies_p (int regnum)
    for all registers (including the floating-point registers).  */
 
 void
-fetch_inferior_registers (struct regcache *regcache, int regnum)
+sparc_fetch_inferior_registers (struct regcache *regcache, int regnum)
 {
   int pid;
 
@@ -186,7 +186,7 @@ fetch_inferior_registers (struct regcache *regcache, int regnum)
 }
 
 void
-store_inferior_registers (struct regcache *regcache, int regnum)
+sparc_store_inferior_registers (struct regcache *regcache, int regnum)
 {
   int pid;
 
@@ -332,8 +332,8 @@ sparc_target (void)
   struct target_ops *t;
 
   t = inf_ptrace_target ();
-  t->to_fetch_registers = fetch_inferior_registers;
-  t->to_store_registers = store_inferior_registers;
+  t->to_fetch_registers = sparc_fetch_inferior_registers;
+  t->to_store_registers = sparc_store_inferior_registers;
   inf_ptrace_xfer_partial = t->to_xfer_partial;
   t->to_xfer_partial = sparc_xfer_partial;
   return t;
diff --git a/gdb/sparc-nat.h b/gdb/sparc-nat.h
index 4eeaeed..90e0331 100644
--- a/gdb/sparc-nat.h
+++ b/gdb/sparc-nat.h
@@ -42,4 +42,7 @@ extern int sparc32_fpregset_supplies_p (int regnum);
 
 extern struct target_ops *sparc_target (void);
 
+extern void sparc_fetch_inferior_registers (struct regcache *, int);
+extern void sparc_store_inferior_registers (struct regcache *, int);
+
 #endif /* sparc-nat.h */
diff --git a/gdb/sparc64-linux-nat.c b/gdb/sparc64-linux-nat.c
index 924d639..a63f3af 100644
--- a/gdb/sparc64-linux-nat.c
+++ b/gdb/sparc64-linux-nat.c
@@ -83,8 +83,8 @@ _initialize_sparc64_linux_nat (void)
   t = linux_target ();
 
   /* Add our register access methods.  */
-  t->to_fetch_registers = fetch_inferior_registers;
-  t->to_store_registers = store_inferior_registers;
+  t->to_fetch_registers = sparc_fetch_inferior_registers;
+  t->to_store_registers = sparc_store_inferior_registers;
 
   /* Register the target.  */
   linux_nat_add_target (t);