Re: [pushed] Fix aarch64-linux-hw-point.c build problem

[Christian Biesinger via Gdb-patches <gdb-patches@sourceware.org>]

On Wed, Feb 24, 2021, 22:52 Kevin Buettner via Gdb-patches <
gdb-patches@sourceware.org> wrote:

> On Wed, 24 Feb 2021 13:52:00 -0700
> Tom Tromey <tom@tromey.com> wrote:
>
> > >>>>> "Kevin" == Kevin Buettner via Gdb-patches <
> gdb-patches@sourceware.org> writes:
> >
> > Kevin> gdb/ChangeLog:
> >
> > Kevin>        * nat/aarch64-linux-hw-point.c: Include <asm/ptrace.h>
> after
> > Kevin>        <sys/ptrace.h>.
> >
> > This seems reasonable, but a comment saying that the order matters might
> > be helpful later on.
>
> Agreed.
>
> I've pushed the following (along with a suitable ChangeLog entry)...
>

Since you said nat/aarch64-sve-linux-ptrace.h also includes these headers,
maybe add the comment there as well?



> diff --git a/gdb/nat/aarch64-linux-hw-point.c
> b/gdb/nat/aarch64-linux-hw-point.c
> index 0278ac2bb28..af2cc4254e2 100644
> --- a/gdb/nat/aarch64-linux-hw-point.c
> +++ b/gdb/nat/aarch64-linux-hw-point.c
> @@ -23,8 +23,15 @@
>  #include "aarch64-linux-hw-point.h"
>
>  #include <sys/uio.h>
> +
> +/* The order in which <sys/ptrace.h> and <asm/ptrace.h> are included
> +   can be important.  <sys/ptrace.h> often declares various PTRACE_*
> +   enums.  <asm/ptrace.h> often defines preprocessor constants for
> +   these very same symbols.  When that's the case, build errors will
> +   result when <asm/ptrace.h> is included before <sys/ptrace.h>.  */
>  #include <sys/ptrace.h>
>  #include <asm/ptrace.h>
> +
>  #include <elf.h>
>
>  /* Number of hardware breakpoints/watchpoints the target supports.
>
>