aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2014-01-20 09:53:12 +0200
committerPedro Alves <palves@redhat.com>2014-01-20 11:43:44 +0000
commite671835b7afc90b3ff201b79f07a6fb67797bc5c (patch)
tree7794ee8f1a2623338738fbfa070902cb548cbe78 /gdb
parentfa72205cb90527fd34753203993859907a53ead2 (diff)
downloadgdb-e671835b7afc90b3ff201b79f07a6fb67797bc5c.zip
gdb-e671835b7afc90b3ff201b79f07a6fb67797bc5c.tar.gz
gdb-e671835b7afc90b3ff201b79f07a6fb67797bc5c.tar.bz2
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.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/gdbserver/ChangeLog5
-rw-r--r--gdb/gdbserver/linux-xtensa-low.c2
-rw-r--r--gdb/xtensa-linux-nat.c1
4 files changed, 11 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8671d4f..78ee329 100644
--- 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 7eb9e60..1deea57 100644
--- 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 7db97a9..479b65b 100644
--- 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 2372e79..9340c62 100644
--- 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"