2008-01-22  Pedro Alves  <pedro@codesourcery.com>

	* arm-tdep.c (arm_addr_bits_remove): In non 26-bit mode, don't
	strip bit 1 even if pc doesn't point to thumb code.

---
 gdb/arm-tdep.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gdb-trunk/gdb/arm-tdep.c
===================================================================
--- gdb-trunk.orig/gdb/arm-tdep.c	2008-01-22 11:10:23.000000000 -0800
+++ gdb-trunk/gdb/arm-tdep.c	2008-01-22 11:12:04.000000000 -0800
@@ -244,7 +244,7 @@
 arm_addr_bits_remove (CORE_ADDR val)
 {
   if (arm_apcs_32)
-    return (val & (arm_pc_is_thumb (val) ? 0xfffffffe : 0xfffffffc));
+    return UNMAKE_THUMB_ADDR (val);
   else
     return (val & 0x03fffffc);
 }