diff -uprN src0/gdb/corefile.c src1/gdb/corefile.c
--- src0/gdb/corefile.c	2009-07-06 09:28:17.000000000 -0400
+++ src1/gdb/corefile.c	2009-08-06 09:55:34.000000000 -0400
@@ -152,7 +152,6 @@ reopen_exec_file (void)
   char *filename;
   int res;
   struct stat st;
-  long mtime;
   struct cleanup *cleanups;
 
   /* Don't do anything if there isn't an exec file. */
@@ -328,7 +327,7 @@ read_memory_string (CORE_ADDR memaddr, c
       cnt = max_len - (cp - buffer);
       if (cnt > 8)
 	cnt = 8;
-      read_memory (memaddr + (int) (cp - buffer), cp, cnt);
+      read_memory (memaddr + (int) (cp - buffer), (gdb_byte *)cp, cnt);
       for (i = 0; i < cnt && *cp; i++, cp++)
 	;			/* null body */
 
diff -uprN src0/gdb/corelow.c src1/gdb/corelow.c
--- src0/gdb/corelow.c	2009-07-31 14:43:25.000000000 -0400
+++ src1/gdb/corelow.c	2009-08-05 16:11:14.000000000 -0400
@@ -644,7 +644,6 @@ core_xfer_partial (struct target_ops *op
 
 	  struct bfd_section *section;
 	  bfd_size_type size;
-	  char *contents;
 
 	  section = bfd_get_section_by_name (core_bfd, ".auxv");
 	  if (section == NULL)
@@ -676,7 +675,6 @@ core_xfer_partial (struct target_ops *op
 
 	  struct bfd_section *section;
 	  bfd_size_type size;
-	  char *contents;
 
 	  section = bfd_get_section_by_name (core_bfd, ".wcookie");
 	  if (section == NULL)
@@ -720,7 +718,6 @@ core_xfer_partial (struct target_ops *op
 
 	  struct bfd_section *section;
 	  bfd_size_type size;
-	  char *contents;
 
 	  char sectionstr[100];
 	  xsnprintf (sectionstr, sizeof sectionstr, "SPU/%s", annex);