Re: [PATCH 1/2] gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h

[James Clarke <jrtc27@jrtc27.com>]

On 15 Dec 2017, at 00:04, James Clarke <jrtc27@jrtc27.com> wrote:
> 
> 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.

Ping (for the series).

James

> ---
> [Originally erroneously sent to the binutils mailing list]
> 
> 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 438177f..1240eea 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 5954945..6faa89b 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__))
> --
> 1.7.10.4
>