gdbserver: fix killed-outside.exp

[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 7f3b98557255d04feb2128574df7937e4e853e3b..221b5b9970416f61023642876d29f6d8875731e7 100644 (file)
--- a/gdb/gdbserver/linux-aarch32-low.c
+++ b/gdb/gdbserver/linux-aarch32-low.c
@@ -27,13 +27,19 @@
 #include <elf.h>
 #endif
 
+/* Some older versions of GNU/Linux and Android do not define
+   the following macros.  */
+#ifndef NT_ARM_VFP
+#define NT_ARM_VFP 0x400
+#endif
+
 /* Collect GP registers from REGCACHE to buffer BUF.  */
 
 void
 arm_fill_gregset (struct regcache *regcache, void *buf)
 {
   int i;
-  uint32_t *regs = buf;
+  uint32_t *regs = (uint32_t *) buf;
 
   for (i = ARM_A1_REGNUM; i <= ARM_PC_REGNUM; i++)
     collect_register (regcache, i, &regs[i]);
@@ -48,7 +54,7 @@ arm_store_gregset (struct regcache *regcache, const void *buf)
 {
   int i;
   char zerobuf[8];
-  const uint32_t *regs = buf;
+  const uint32_t *regs = (const uint32_t *) buf;
 
   memset (zerobuf, 0, 8);
   for (i = ARM_A1_REGNUM; i <= ARM_PC_REGNUM; i++)
@@ -114,7 +120,7 @@ static struct regset_info aarch32_regsets[] = {
   { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_VFP, 32 * 8 + 4,
     EXTENDED_REGS,
     arm_fill_vfpregset, arm_store_vfpregset },
-  { 0, 0, 0, -1, -1, NULL, NULL }
+  NULL_REGSET
 };
 
 static struct regsets_info aarch32_regsets_info =