diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b9de792552..455fd99afc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-30  Markus Deuling  <deuling@de.ibm.com>
+
+	* arm-linux-tdep.c (arm_linux_supply_gregset): Use get_regcache_arch
+	to get at the current architecture by regcache.
+
 2007-10-30  Markus Deuling  <deuling@de.ibm.com>
 
 	* alphabsd-nat.c (alphabsd_fetch_inferior_registers)
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index fd6b2e5a6a..cdbb910367 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -392,7 +392,7 @@ arm_linux_supply_gregset (const struct regset *regset,
       reg_pc = extract_unsigned_integer (gregs
 					 + INT_REGISTER_SIZE * ARM_PC_REGNUM,
 					 INT_REGISTER_SIZE);
-      reg_pc = gdbarch_addr_bits_remove (current_gdbarch, reg_pc);
+      reg_pc = gdbarch_addr_bits_remove (get_regcache_arch (regcache), reg_pc);
       store_unsigned_integer (pc_buf, INT_REGISTER_SIZE, reg_pc);
       regcache_raw_supply (regcache, ARM_PC_REGNUM, pc_buf);
     }