Backport fix From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001 From: James Clarke Date: Fri, 19 Jan 2018 17:22:49 +0000 Subject: [PATCH 1/1] 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/nat/linux-ptrace.c | 2 -- gdb/nat/linux-ptrace.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c index f00f179..0dc32b5 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" #include /* Stores the ptrace options supported by the running kernel. diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h index 0a23bcb..d84114b 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__)) -- 2.7.4