From 1ef6a59696042af18098ac295ae589ddd01b9d1e Mon Sep 17 00:00:00 2001 From: Luis Machado Date: Fri, 9 Apr 2021 11:19:22 -0300 Subject: [PATCH] [AArch64] Fix include order for MTE Similarly to commit 665af52ec2a52184d39a76d6e724fa4733dbab3c, fix a build failure seen with an updated glibc, due to the enum/constant mismatch. The old include file order eventually makes asm/ptrace.h get included before sys/ptrace.h. This patch fixes it. Seems fairly obvious and I'll push it shortly. gdb/ChangeLog: 2021-04-09 Luis Machado * nat/aarch64-mte-linux-ptrace.c: Update include file order. --- gdb/ChangeLog | 4 ++++ gdb/nat/aarch64-mte-linux-ptrace.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 136eb87a76..c5ed593582 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2021-04-09 Luis Machado + + * nat/aarch64-mte-linux-ptrace.c: Update include file order. + 2021-04-08 Dominique Quatravaux * darwin-nat.c (darwin_nat_target::resume): Remove status diff --git a/gdb/nat/aarch64-mte-linux-ptrace.c b/gdb/nat/aarch64-mte-linux-ptrace.c index 47f4ab68d1..524cdbee4a 100644 --- a/gdb/nat/aarch64-mte-linux-ptrace.c +++ b/gdb/nat/aarch64-mte-linux-ptrace.c @@ -20,12 +20,13 @@ #include "gdbsupport/common-defs.h" #include "gdbsupport/byte-vector.h" +#include "linux-ptrace.h" + #include "arch/aarch64.h" #include "arch/aarch64-mte-linux.h" #include "nat/aarch64-linux.h" #include "nat/aarch64-mte-linux-ptrace.h" -#include "linux-ptrace.h" #include /* Helper function to display various possible errors when reading -- 2.34.1