提交: ce1f8608d5debf47bf2312b937abdaab5e4dcc4e - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• 修訂: ce1f8608d5debf47bf2312b937abdaab5e4dcc4e (tree)
• 時間: 2014-01-22 21:22:26
• 作者: Baruch Siach <baruch@tkos...>
• Commiter: Pedro Alves

Log Message

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.

Change Summary

• modified: gdb/ChangeLog
• modified: gdb/gdbserver/ChangeLog
• modified: gdb/gdbserver/linux-xtensa-low.c
• modified: gdb/xtensa-linux-nat.c

差異

--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
[phone]  Baruch Siach  <[e-mail]>
+
+	* xtensa-linux-nat.c: Include asm/ptrace.h.
+
 2013-12-16  Pedro Alves  <[e-mail]>
 
 	PR 16329

--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Baruch Siach  <[e-mail]>
+
+	* linux-xtensa-low.c: Include asm/ptrace.h instead of
+	sys/ptrace.h.
+
 2013-09-16  Will Newton  <[e-mail]>
 
 	* linux-aarch64-low.c (aarch64_linux_set_debug_regs): Zero

--- a/gdb/gdbserver/linux-xtensa-low.c
+++ b/gdb/gdbserver/linux-xtensa-low.c
@@ -23,7 +23,7 @@
 /* Defined in auto-generated file reg-xtensa.c.  */
 void init_registers_xtensa (void);
 
-#include <sys/ptrace.h>
+#include <asm/ptrace.h>
 #include <xtensa-config.h>
 
 #include "xtensa-xtregs.c"

--- a/gdb/xtensa-linux-nat.c
+++ b/gdb/xtensa-linux-nat.c
@@ -37,6 +37,7 @@
 #include <fcntl.h>
 #include <sys/procfs.h>
 #include <sys/ptrace.h>
+#include <asm/ptrace.h>
 
 #include "gregset.h"
 #include "xtensa-tdep.h"