diff --git a/gdb/putenv.c b/gdb/putenv.c
index d111e85d25..e2ea3572d9 100644
--- a/gdb/putenv.c
+++ b/gdb/putenv.c
@@ -30,7 +30,7 @@ domain program.
 
 extern  char  **environ;
 
-char  *index();
+char  *strchr();
 char  *malloc();
 
 /****************************************************************/
@@ -74,7 +74,7 @@ putenv( entry )
 
   /*  Find the length of the "NAME="  */
 
-  temp = index(entry,'=');
+  temp = strchr(entry,'=');
   if ( temp == 0 )
     return( -1 );
 
diff --git a/gdb/regex.c b/gdb/regex.c
index e4261b3c3c..a945af5cbc 100644
--- a/gdb/regex.c
+++ b/gdb/regex.c
@@ -32,13 +32,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #else  /* not emacs */
 
-#ifdef USG
-#ifndef BSTRING
 #define bcopy(s,d,n)	memcpy((d),(s),(n))
 #define bcmp(s1,s2,n)	memcmp((s1),(s2),(n))
 #define bzero(s,n)	memset((s),0,(n))
-#endif
-#endif
 
 /* Make alloca work the best possible way.  */
 #ifdef __GNUC__
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 3bafd6a420..acb26dd546 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -35,6 +35,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* From infrun.c */
 extern int stop_after_trap;
 
+/* We don't store all registers immediately when requested, since they
+   get sent over in large chunks anyway.  Instead, we accumulate most
+   of the changes and send them over once.  "deferred_stores" keeps
+   track of which sets of registers we have locally-changed copies of,
+   so we only need send the groups that have changed.  */
+
+int deferred_stores = 0;	/* Cumulates stores we want to do eventually. */
+
 typedef enum
 {
   Error, not_branch, bicc, bicca, ba, baa, ticc, ta
@@ -227,7 +235,7 @@ static int save_insn_opcodes[] = {
 /* Neither do_save_insn or do_restore_insn save stack configuration
    (current_frame, etc),
    since the stack is in an indeterminate state through the call to
-   each of them.  That responsibility of the routine which calls them.  */
+   each of them.  That is the responsibility of the routine which calls them.  */
 
 static void
 do_save_insn (size)
@@ -464,7 +472,7 @@ sparc_frame_find_saved_regs (fi, saved_regs_addr)
   if (!fid)
     fatal ("Bad frame info struct in FRAME_FIND_SAVED_REGS");
 
-  (void) memset (saved_regs_addr, 0, sizeof (*saved_regs_addr));
+  memset (saved_regs_addr, 0, sizeof (*saved_regs_addr));
 
   /* Old test.
   if (fi->pc >= frame - CALL_DUMMY_LENGTH - 0x140
@@ -692,13 +700,13 @@ void
 supply_gregset (gregsetp)
 prgregset_t *gregsetp;
 {
-  register int regno;
+  register int regi;
   register prgreg_t *regp = (prgreg_t *) gregsetp;
 
   /* GDB register numbers for Gn, On, Ln, In all match /proc reg numbers.  */
-  for (regno = G0_REGNUM ; regno <= I7_REGNUM ; regno++)
+  for (regi = G0_REGNUM ; regi <= I7_REGNUM ; regi++)
     {
-      supply_register (regno, (char *) (regp + regno));
+      supply_register (regi, (char *) (regp + regi));
     }
 
   /* These require a bit more care.  */
@@ -721,7 +729,7 @@ int regno;
     {
       if ((regno == -1) || (regno == regi))
 	{
-	  *(regp + regno) = *(int *) &registers[REGISTER_BYTE (regi)];
+	  *(regp + regi) = *(int *) &registers[REGISTER_BYTE (regi)];
 	}
     }
   if ((regno == -1) || (regno == PS_REGNUM))
@@ -784,7 +792,7 @@ int regno;
 	{
 	  from = (char *) &registers[REGISTER_BYTE (regi)];
 	  to = (char *) &fpregsetp->pr_fr.pr_regs[regi-FP0_REGNUM];
-	  bcopy (from, to, REGISTER_RAW_SIZE (regno));
+	  memcpy (to, from, REGISTER_RAW_SIZE (regi));
 	}
     }
   if ((regno == -1) || (regno == FPS_REGNUM))
diff --git a/gdb/sparc-xdep.c b/gdb/sparc-xdep.c
index c8c164d944..a040bf5ffb 100644
--- a/gdb/sparc-xdep.c
+++ b/gdb/sparc-xdep.c
@@ -43,7 +43,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define	STACK_REGS	2
 #define	FP_REGS		4
 
-int deferred_stores = 0;	/* Cumulates stores we want to do eventually. */
+/* The variable deferred_stores itself is defined in sparc-tdep.c.  */
 
 /* Fetch one or more registers from the inferior.  REGNO == -1 to get
    them all.  We actually fetch more than requested, when convenient,