Move ARM_CPSR_GREGNUM to arch/arm-linux.h

[deliverable/binutils-gdb.git] / gdb / gdbserver / linux-aarch32-low.c

diff --git a/gdb/gdbserver/linux-aarch32-low.c b/gdb/gdbserver/linux-aarch32-low.c
index 2bbbb2465795cce23d585bc6cbba13d8ce99b280..0c4b14036419a42eae251b0a9995dae6cd2a710c 100644 (file)
--- a/gdb/gdbserver/linux-aarch32-low.c
+++ b/gdb/gdbserver/linux-aarch32-low.c
@@ -17,6 +17,7 @@
 
 #include "server.h"
 #include "arch/arm.h"
+#include "arch/arm-linux.h"
 #include "linux-low.h"
 #include "linux-aarch32-low.h"
 
@@ -65,7 +66,7 @@ arm_fill_gregset (struct regcache *regcache, void *buf)
   for (i = ARM_A1_REGNUM; i <= ARM_PC_REGNUM; i++)
     collect_register (regcache, i, &regs[i]);
 
-  collect_register (regcache, ARM_PS_REGNUM, &regs[16]);
+  collect_register (regcache, ARM_PS_REGNUM, &regs[ARM_CPSR_GREGNUM]);
 }
 
 /* Supply GP registers contents, stored in BUF, to REGCACHE.  */
@@ -84,7 +85,7 @@ arm_store_gregset (struct regcache *regcache, const void *buf)
   for (; i < ARM_PS_REGNUM; i++)
     supply_register (regcache, i, zerobuf);
 
-  supply_register (regcache, ARM_PS_REGNUM, &regs[16]);
+  supply_register (regcache, ARM_PS_REGNUM, &regs[ARM_CPSR_GREGNUM]);
 }
 
 /* Collect NUM number of VFP registers from REGCACHE to buffer BUF.  */