gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h
authorJames Clarke <jrtc27@jrtc27.com>
Fri, 19 Jan 2018 17:22:49 +0000 (17:22 +0000)
committerPedro Alves <palves@redhat.com>
Fri, 19 Jan 2018 18:17:54 +0000 (18:17 +0000)
commit5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8
tree19fcb6666760646cfb248ee4f1bcffbeffada0f7
parentbc09b0c14fb713a9aec25e09b78499f3bc2441b5
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.
gdb/ChangeLog
gdb/nat/linux-ptrace.c
gdb/nat/linux-ptrace.h