From: Andrew Pinski <apinski@marvell.com>
Date: Thu, 21 Oct 2021 17:02:44 +0000 (+0000)
Subject: Fix ARMv8.4 for hw watchpoint and breakpoint
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=add3db9182348555b80ec850b58a6f423b0e6bc5;p=binutils-gdb.git

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 5540a01f424..c073b43d613 100644
--- 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 2fc4b400ece..ad32a671967 100644
--- 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: