Fix ARMv8.4 for hw watchpoint and breakpoint

Just like my previoius patch for ARMv8.1 and v8.2 (49ecef2a7da2ee9df4),
this adds ARMv8.4 debug arch as being compatible for hw watchpoint
and breakpoints.

diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
index 5540a01f424f996a33c30d4f1b70c0d1481d9961..c073b43d613ca380d2dd467cf324b9af670a72a3 100644 (file)
--- a/gdb/nat/aarch64-linux-hw-point.c
+++ b/gdb/nat/aarch64-linux-hw-point.c
@@ -781,6 +781,8 @@ compatible_debug_arch (unsigned int debug_arch)
     return true;
   if (debug_arch == AARCH64_DEBUG_ARCH_V8_2)
     return true;
+  if (debug_arch == AARCH64_DEBUG_ARCH_V8_4)
+    return true;
 
   return false;
 }

diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
index 2fc4b400ece3671a8250f88638ba4f5db15ce6ec..ad32a67196744adeefb860a80f857ec59c18c677 100644 (file)
--- a/gdb/nat/aarch64-linux-hw-point.h
+++ b/gdb/nat/aarch64-linux-hw-point.h
@@ -72,6 +72,7 @@
 #define AARCH64_DEBUG_ARCH_V8 0x6
 #define AARCH64_DEBUG_ARCH_V8_1 0x7
 #define AARCH64_DEBUG_ARCH_V8_2 0x8
+#define AARCH64_DEBUG_ARCH_V8_4 0x9
 
 /* ptrace expects control registers to be formatted as follows: