From: Luis Machado <luis.machado@arm.com>
Date: Fri, 22 Jul 2022 10:22:29 +0000 (+0100)
Subject: [Morello GDB] Fix bug in conditional definition of morello structs
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6198c2216f4474302f5d37cd1fd28e56031d66e4;p=thirdparty%2Fbinutils-gdb.git

[Morello GDB] Fix bug in conditional definition of morello structs

The previous commit fixing this issue (bf5ddcecc07c2d89e824851f5f940ebe7e2af0fd)
failed to spot an issue with include ordering.

Fix all such issues with this patch.
---

diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
index 36f9cb30662..3ad838ce3b4 100644
--- a/gdb/aarch64-linux-nat.c
+++ b/gdb/aarch64-linux-nat.c
@@ -33,10 +33,6 @@
 #include "aarch32-tdep.h"
 #include "arch/arm.h"
 #include "arch/aarch64-cap-linux.h"
-#include "nat/aarch64-cap-linux.h"  /* For Morello */
-#include "nat/aarch64-linux.h"
-#include "nat/aarch64-linux-hw-point.h"
-#include "nat/aarch64-sve-linux-ptrace.h"
 
 #include "elf/external.h"
 #include "elf/common.h"
@@ -52,6 +48,11 @@
 #include "gdb_proc_service.h"
 #include "arch-utils.h"
 
+#include "nat/aarch64-cap-linux.h"  /* For Morello */
+#include "nat/aarch64-linux.h"
+#include "nat/aarch64-linux-hw-point.h"
+#include "nat/aarch64-sve-linux-ptrace.h"
+
 #ifndef TRAP_HWBKPT
 #define TRAP_HWBKPT 0x0004
 #endif
diff --git a/gdb/nat/aarch64-cap-linux.c b/gdb/nat/aarch64-cap-linux.c
index 34aa5ec1ac0..62a4dcdff72 100644
--- a/gdb/nat/aarch64-cap-linux.c
+++ b/gdb/nat/aarch64-cap-linux.c
@@ -16,8 +16,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "gdbsupport/common-defs.h"
-#include "aarch64-cap-linux.h"
 #include "gdb_ptrace.h"
+#include "aarch64-cap-linux.h"
 
 /* Helper function to display various possible errors when reading
    Morello capabilities from memory.  */
diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc
index 3a6537a9e8e..1f63e8dda34 100644
--- a/gdbserver/linux-aarch64-low.cc
+++ b/gdbserver/linux-aarch64-low.cc
@@ -21,9 +21,6 @@
 
 #include "server.h"
 #include "linux-low.h"
-#include "nat/aarch64-cap-linux.h" /* For Morello  */
-#include "nat/aarch64-linux.h"
-#include "nat/aarch64-linux-hw-point.h"
 #include "arch/aarch64-cap-linux.h"
 #include "arch/aarch64-insn.h"
 #include "linux-aarch32-low.h"
@@ -45,6 +42,10 @@
 #include "linux-aarch32-tdesc.h"
 #include "linux-aarch64-tdesc.h"
 #include "nat/aarch64-sve-linux-ptrace.h"
+#include "nat/aarch64-cap-linux.h" /* For Morello  */
+#include "nat/aarch64-linux.h"
+#include "nat/aarch64-linux-hw-point.h"
+
 #include "tdesc.h"
 
 #ifdef HAVE_SYS_REG_H