diff -uprN src0/gdb/blockframe.c src1/gdb/blockframe.c
--- src0/gdb/blockframe.c	2009-07-06 09:28:17.000000000 -0400
+++ src1/gdb/blockframe.c	2009-08-05 16:48:22.000000000 -0400
@@ -62,7 +62,6 @@ struct block *
 get_frame_block (struct frame_info *frame, CORE_ADDR *addr_in_block)
 {
   const CORE_ADDR pc = get_frame_address_in_block (frame);
-  struct frame_info *next_frame;
   struct block *bl;
   int inline_count;
 
@@ -363,7 +362,6 @@ block_innermost_frame (struct block *blo
   struct frame_info *frame;
   CORE_ADDR start;
   CORE_ADDR end;
-  CORE_ADDR calling_pc;
 
   if (block == NULL)
     return NULL;