Source: Community and MontaVista Software, Inc.
Description:
  Return the status register, so that single-stepping over conditional
  branches works correctly on ARM.

2002-11-17  Stuart Hughes  <seh@zee2.com>

	* linux-arm-low.c (arm_num_regs): Increase.
	(arm_regmap): Include status register.

2002-11-17  Daniel Jacobowitz  <drow@mvista.com>

	* linux-low.c (register_addr): Remove incorrect -1 check.

diff -ur gdb-5.2.1/gdb/gdbserver.bak/linux-arm-low.c gdb-5.2.1/gdb/gdbserver/linux-arm-low.c
--- gdb-5.2.1/gdb/gdbserver.bak/linux-arm-low.c	2002-10-28 17:20:19.000000000 -0500
+++ gdb-5.2.1/gdb/gdbserver/linux-arm-low.c	2002-11-17 19:48:42.000000000 -0500
@@ -26,11 +26,13 @@
 #include <sys/reg.h>
 #endif
 
-#define arm_num_regs 16
+#define arm_num_regs 26
 
 static int arm_regmap[] = {
   0, 4, 8, 12, 16, 20, 24, 28,
   32, 36, 40, 44, 48, 52, 56, 60,
+  -1, -1, -1, -1, -1, -1, -1, -1, -1,
+  64
 };
 
 static int
diff -ur gdb-5.2.1/gdb/gdbserver.bak/linux-low.c gdb-5.2.1/gdb/gdbserver/linux-low.c
--- gdb-5.2.1/gdb/gdbserver.bak/linux-low.c	2002-10-28 17:20:20.000000000 -0500
+++ gdb-5.2.1/gdb/gdbserver/linux-low.c	2002-11-17 19:48:42.000000000 -0500
@@ -1120,8 +1120,6 @@
     error ("Invalid register number %d.", regnum);
 
   addr = the_low_target.regmap[regnum];
-  if (addr == -1)
-    addr = 0;
 
   return addr;
 }