gdb: xtensa: fix linux ptrace includes

Currently, xtensa code using the Linux ptrace interface only include
sys/ptrace.h.  This file comes from the C library (glibc and uClibc,
at least), and includes a declaration of the ptrace() functions, along
with some cross architecture constants that are mostly copied from the
file located at include/uapi/linux/ptrace.h in recent Linux kernels.

For xtensa specific constants like PTRACE_GETXTREGS and
PTRACE_SETXTREGS the asm/ptrace.h include from the Linux kernel UAPI
is needed.  The code in gdbserver xtensa specific part doesn't call
ptrace() directly, so we can remove the unneeded sys/ptrace.h include.
The gdb xtensa specific code needs both headers, since it calls
ptrace().

gdb/
	* xtensa-linux-nat.c: Include asm/ptrace.h.

gdb/gdbserver/
	* linux-xtensa-low.c: Include asm/ptrace.h instead of
	sys/ptrace.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8671d4fdbeab14948408b19e5e265f5420cb35dd..78ee32918b1933574468bb87f9d30e674f3b5617 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-20  Baruch Siach  <baruch@tkos.co.il>
+
+       * xtensa-linux-nat.c: Include asm/ptrace.h.
+
 2014-01-17  Iain Buclaw  <ibuclaw@gdcproject.org>
 
        * Makefile.in (SFILES): Add d-support.c.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 7eb9e60dfdc24ed4185f884c3a0f970581b8cdec..1deea578a6bd7b4dca5f44393417d01db99ad96f 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-20  Baruch Siach  <baruch@tkos.co.il>
+
+       * linux-xtensa-low.c: Include asm/ptrace.h instead of
+       sys/ptrace.h.
+
 2014-01-17  Pedro Alves  <palves@redhat.com>
 
        PR build/16445

diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c
index 7db97a9cc543fef70dccccb52c1555b549a18753..479b65b26b0064ba8663d39ff9054c4a13ecc946 100644 (file)
--- a/gdb/gdbserver/linux-xtensa-low.c
+++ b/gdb/gdbserver/linux-xtensa-low.c
@@ -24,7 +24,7 @@
 void init_registers_xtensa (void);
 extern const struct target_desc *tdesc_xtensa;
 
-#include <sys/ptrace.h>
+#include <asm/ptrace.h>
 #include <xtensa-config.h>
 
 #include "xtensa-xtregs.c"

diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
index 2372e792f3fe21b66cc940d7f5797fdd32a54081..9340c62fe8585154e18e466887bfb3ae96f46589 100644 (file)
--- a/gdb/xtensa-linux-nat.c
+++ b/gdb/xtensa-linux-nat.c
@@ -36,6 +36,7 @@
 #include <fcntl.h>
 #include <sys/procfs.h>
 #include <sys/ptrace.h>
+#include <asm/ptrace.h>
 
 #include "gregset.h"
 #include "xtensa-tdep.h"