-#define ARM_LINUX_SIZEOF_NWFPE (8 * FP_REGISTER_SIZE \
- + 2 * INT_REGISTER_SIZE \
- + 8 + INT_REGISTER_SIZE)
-
-/* The index to access CSPR in user_regs defined in GLIBC. */
-#define ARM_CPSR_GREGNUM 16
+#define ARM_LINUX_SIZEOF_NWFPE (8 * ARM_FP_REGISTER_SIZE \
+ + 2 * ARM_INT_REGISTER_SIZE \
+ + 8 + ARM_INT_REGISTER_SIZE)