This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h


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

commit 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8
Author: James Clarke <jrtc27@jrtc27.com>
Date:   Fri Jan 19 17:22:49 2018 +0000

    gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h
    
    On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
    contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
    define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
    earlier; include it from linux-ptrace.h so it can never come afterwards.
    
    gdb/ChangeLog:
    
    	* nat/linux-ptrace.c: Remove unnecessary reinclusion of
    	gdb_ptrace.h, and move including gdb_wait.h ...
    	* nat/linux-ptrace.h: ... to here.

Diff:
---
 gdb/ChangeLog          | 6 ++++++
 gdb/nat/linux-ptrace.c | 2 --
 gdb/nat/linux-ptrace.h | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5467e89..e274caa 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-19  James Clarke  <jrtc27@jrtc27.com>
+
+	* nat/linux-ptrace.c: Remove unnecessary reinclusion of
+	gdb_ptrace.h, and move including gdb_wait.h ...
+	* nat/linux-ptrace.h: ... to here.
+
 2018-01-19  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* inf-ptrace.c (inf_ptrace_detach): Adjust call to
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 5c4ddc9..1f21ef0 100644
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -21,8 +21,6 @@
 #include "linux-procfs.h"
 #include "linux-waitpid.h"
 #include "buffer.h"
-#include "gdb_wait.h"
-#include "gdb_ptrace.h"
 #ifdef HAVE_SYS_PROCFS_H
 #include <sys/procfs.h>
 #endif
diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
index 60967a3..dc180fb 100644
--- a/gdb/nat/linux-ptrace.h
+++ b/gdb/nat/linux-ptrace.h
@@ -21,6 +21,7 @@
 struct buffer;
 
 #include "nat/gdb_ptrace.h"
+#include "gdb_wait.h"
 
 #ifdef __UCLIBC__
 #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]