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

	* arm-linux-nat.c (fetch_register, fetch_regs): Use get_regcache_arch
	to get at the current architecture by regcache.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 65b2043..c32d77c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-31  Markus Deuling  <deuling@de.ibm.com>
+
+       * arm-linux-nat.c (fetch_register, fetch_regs): Use get_regcache_arch
+       to get at the current architecture by regcache.
+
 2007-10-30  Markus Deuling  <deuling@de.ibm.com>
 
        * libunwind-frame.c (libunwind_frame_sniffer)

diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index bc00593..225be5f 100644 (file)
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -255,7 +255,8 @@ fetch_register (struct regcache *regcache, int regno)
   if (ARM_PC_REGNUM == regno)
     { 
       regs[ARM_PC_REGNUM] = gdbarch_addr_bits_remove
-                             (current_gdbarch, regs[ARM_PC_REGNUM]);
+                             (get_regcache_arch (regcache),
+                              regs[ARM_PC_REGNUM]);
       regcache_raw_supply (regcache, ARM_PC_REGNUM,
                           (char *) &regs[ARM_PC_REGNUM]);
     }
@@ -291,7 +292,7 @@ fetch_regs (struct regcache *regcache)
                         (char *) &regs[ARM_PC_REGNUM]);
 
   regs[ARM_PC_REGNUM] = gdbarch_addr_bits_remove
-                         (current_gdbarch, regs[ARM_PC_REGNUM]);
+                         (get_regcache_arch (regcache), regs[ARM_PC_REGNUM]);
   regcache_raw_supply (regcache, ARM_PC_REGNUM,
                       (char *) &regs[ARM_PC_REGNUM]);
 }