Index: microblaze-linux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/microblaze-linux-tdep.c,v
retrieving revision 1.1
diff -u -p -r1.1 microblaze-linux-tdep.c
--- microblaze-linux-tdep.c	15 Oct 2009 19:28:52 -0000	1.1
+++ microblaze-linux-tdep.c	16 Oct 2009 15:48:14 -0000
@@ -38,7 +38,8 @@
 
 
 static int
-microblaze_linux_memory_remove_breakpoint (struct bp_target_info *bp_tgt)
+microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch, 
+					   struct bp_target_info *bp_tgt)
 {
   CORE_ADDR addr = bp_tgt->placed_address;
   const gdb_byte *bp;
@@ -74,8 +75,8 @@ microblaze_linux_sigtramp_cache (struct 
   struct gdbarch *gdbarch = get_frame_arch (next_frame);
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
-  base = frame_unwind_register_unsigned (next_frame, SP_REGNUM);
-  if (bias > 0 && frame_pc_unwind (next_frame) != func)
+  base = frame_unwind_register_unsigned (next_frame, MICROBLAZE_SP_REGNUM);
+  if (bias > 0 && get_frame_address_in_block (next_frame) != func)
     /* See below, some signal trampolines increment the stack as their
        first instruction, need to compensate for that.  */
     base -= bias;
Index: microblaze-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/microblaze-tdep.c,v
retrieving revision 1.1
diff -u -p -r1.1 microblaze-tdep.c
--- microblaze-tdep.c	15 Oct 2009 19:28:52 -0000	1.1
+++ microblaze-tdep.c	16 Oct 2009 15:48:15 -0000
@@ -63,9 +63,6 @@
 #define IS_SAVE_HIDDEN_PTR(op, rd, ra, rb) \
 	((op == add || op == addik) && ra == MICROBLAZE_FIRST_ARGREG && rb == 0)
 
-/* All registers are 32 bits.  */
-#define MICROBLAZE_REGISTER_SIZE 4
-
 /* The registers of the Xilinx microblaze processor.  */
 
 static const char *microblaze_register_names[] =
Index: microblaze-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/microblaze-tdep.h,v
retrieving revision 1.1
diff -u -p -r1.1 microblaze-tdep.h
--- microblaze-tdep.h	15 Oct 2009 19:28:52 -0000	1.1
+++ microblaze-tdep.h	16 Oct 2009 15:48:15 -0000
@@ -110,6 +110,9 @@ enum microblaze_regnum 
   MICROBLAZE_RTLBHI_REGNUM
 };
 
+/* All registers are 32 bits.  */
+#define MICROBLAZE_REGISTER_SIZE 4
+
 /* MICROBLAZE_BREAKPOINT defines the breakpoint that should be used.
    Only used for native debugging.  */
 #define MICROBLAZE_BREAKPOINT {0xb9, 0xcc, 0x00, 0x60}