[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 4ca2e3738515b298adab8acc1fad21b06c0830c6..476a2d1e3b29e597438b16ee4f58529599fb7098 100644 (file)
--- a/gdb/aarch64-linux-nat.c
+++ b/gdb/aarch64-linux-nat.c
@@ -34,10 +34,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"
@@ -57,6 +53,11 @@
 
 #include "nat/aarch64-mte-linux-ptrace.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 34aa5ec1ac02c43ddf9cb6fbe47d78ca949dc1dc..62a4dcdff723702830c09521e229c38bef54022e 100644 (file)
--- 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 cf36cbe71abb2fcfc0d11332a3cd1e7c03e11c66..8013edf0459b3687435a11ad8ca28ca509786c6f 100644 (file)
--- 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"
@@ -47,6 +44,10 @@
 #include "linux-aarch64-tdesc.h"
 #include "nat/aarch64-mte-linux-ptrace.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