2007-10-30 Markus Deuling <deuling@de.ibm.com>

	* arm-tdep.c (arm_get_next_pc): Replace current_gdbarch by gdbarch.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 54510e4..bae6abe 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-30  Markus Deuling  <deuling@de.ibm.com>
 
+       * arm-tdep.c (arm_get_next_pc): Replace current_gdbarch by gdbarch.
+
+2007-10-30  Markus Deuling  <deuling@de.ibm.com>
+
        * armnbsd-nat.c (arm_supply_gregset, fetch_register, store_register)
        (store_regs): Use get_regcache_arch to get at the current architecture
        by regcache.

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 82e5a6a..190f6a1 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -1719,7 +1719,7 @@ arm_get_next_pc (struct frame_info *frame, CORE_ADDR pc)
          nextpc = BranchDest (pc, this_instr);
          nextpc |= bit (this_instr, 24) << 1;
 
-         nextpc = gdbarch_addr_bits_remove (current_gdbarch, nextpc);
+         nextpc = gdbarch_addr_bits_remove (gdbarch, nextpc);
          if (nextpc == pc)
            error (_("Infinite loop detected"));
          break;