diff -uprN src0/gdb/mem-break.c src1/gdb/mem-break.c
--- src0/gdb/mem-break.c	2009-07-06 09:28:19.000000000 -0400
+++ src1/gdb/mem-break.c	2009-08-06 09:21:34.000000000 -0400
@@ -46,7 +46,6 @@ default_memory_insert_breakpoint (struct
 {
   int val;
   const unsigned char *bp;
-  int bplen;
 
   /* Determine appropriate breakpoint contents and size for this address.  */
   bp = gdbarch_breakpoint_from_pc
diff -uprN src0/gdb/memattr.c src1/gdb/memattr.c
--- src0/gdb/memattr.c	2009-06-18 10:14:26.000000000 -0400
+++ src1/gdb/memattr.c	2009-08-06 09:21:21.000000000 -0400
@@ -292,9 +292,6 @@ lookup_mem_region (CORE_ADDR addr)
 void
 invalidate_target_mem_regions (void)
 {
-  struct mem_region *m;
-  int ix;
-
   if (!target_mem_regions_valid)
     return;
 
@@ -497,6 +494,8 @@ mem_info_command (char *args, int from_t
 	case MEM_FLASH:
 	  printf_filtered ("flash blocksize 0x%x ", attrib->blocksize);
 	  break;
+	case MEM_NONE:
+	  break;
 	}
 
       switch (attrib->width)
@@ -655,7 +654,7 @@ mem_disable_command (char *args, int fro
 static void
 mem_delete (int num)
 {
-  struct mem_region *m1, *m;
+  struct mem_region *m;
   int ix;
 
   if (!mem_region_list)