[binutils-gdb] Use PTRACE_GETREGSET/SETREGSET in nios2 gdbserver.

[Sandra Loosemore <sandra at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=21e94bd9f0888034c094e02c75d382d75340326c

commit 21e94bd9f0888034c094e02c75d382d75340326c
Author: Sandra Loosemore <sandra@codesourcery.com>
Date:   Fri May 8 12:32:43 2015 -0700

    Use PTRACE_GETREGSET/SETREGSET in nios2 gdbserver.
    
    2015-05-08  Sandra Loosemore  <sandra@codesourcery.com>
    
    	gdb/gdbserver/
    	* linux-nios2-low.c: Include elf/common.h.  Adjust comments.
    	Remove HAVE_PTRACE_GETREGS conditionals.
    	(nios2_regsets): Use PTRACE_GETREGSET and PTRACE_SETREGSET
    	instead of PTRACE_GETREGS and PTRACE_SETREGS.

Diff:
---
 gdb/gdbserver/ChangeLog         |  7 +++++++
 gdb/gdbserver/linux-nios2-low.c | 11 ++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 191c90e..c33f90a 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-08  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* linux-nios2-low.c: Include elf/common.h.  Adjust comments.
+	Remove HAVE_PTRACE_GETREGS conditionals.
+	(nios2_regsets): Use PTRACE_GETREGSET and PTRACE_SETREGSET
+	instead of PTRACE_GETREGS and PTRACE_SETREGS.
+
 2015-05-08  Yao Qi  <yao.qi@linaro.org>
 
 	* linux-low.c (linux_supports_conditional_breakpoints): New
diff --git a/gdb/gdbserver/linux-nios2-low.c b/gdb/gdbserver/linux-nios2-low.c
index e2fbb89..7bd3c97 100644
--- a/gdb/gdbserver/linux-nios2-low.c
+++ b/gdb/gdbserver/linux-nios2-low.c
@@ -21,6 +21,7 @@
 
 #include "server.h"
 #include "linux-low.h"
+#include "elf/common.h"
 #include <sys/ptrace.h>
 #include <endian.h>
 #include "gdb_proc_service.h"
@@ -32,7 +33,7 @@
 
 /* The following definition must agree with the number of registers
    defined in "struct user_regs" in GLIBC
-   (ports/sysdeps/unix/sysv/linux/nios2/sys/user.h), and also with
+   (sysdeps/unix/sysv/linux/nios2/sys/user.h), and also with
    NIOS2_NUM_REGS in GDB proper.  */
 
 #define nios2_num_regs 49
@@ -163,8 +164,6 @@ ps_get_thread_area (const struct ps_prochandle *ph,
   return PS_OK;
 }
 
-#ifdef HAVE_PTRACE_GETREGS
-
 /* Helper functions to collect/supply a single register REGNO.  */
 
 static void
@@ -205,14 +204,12 @@ nios2_store_gregset (struct regcache *regcache, const void *buf)
   for (i = 0; i < nios2_num_regs; i++)
     nios2_supply_register (regcache, i, regset + i);
 }
-#endif /* HAVE_PTRACE_GETREGS */
 
 static struct regset_info nios2_regsets[] =
 {
-#ifdef HAVE_PTRACE_GETREGS
-  { PTRACE_GETREGS, PTRACE_SETREGS, 0, nios2_num_regs * 4, GENERAL_REGS,
+  { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
+    nios2_num_regs * 4, GENERAL_REGS,
     nios2_fill_gregset, nios2_store_gregset },
-#endif /* HAVE_PTRACE_GETREGS */
   { 0, 0, 0, -1, -1, NULL, NULL }
 };