diff --git a/src/arch/arm/remote_gdb.cc b/src/arch/arm/remote_gdb.cc
index d14e1c1772..5382d51ebb 100644
--- a/src/arch/arm/remote_gdb.cc
+++ b/src/arch/arm/remote_gdb.cc
@@ -361,4 +361,11 @@ RemoteGDB::gdbRegs()
         return &regCache32;
 }
 
+bool
+RemoteGDB::checkBpLen(size_t len)
+{
+    // 2 for Thumb ISA, 4 for ARM ISA.
+    return len == 2 || len == 4;
+}
+
 } // namespace gem5
diff --git a/src/arch/arm/remote_gdb.hh b/src/arch/arm/remote_gdb.hh
index 5c5a37d617..cff6d4a9c2 100644
--- a/src/arch/arm/remote_gdb.hh
+++ b/src/arch/arm/remote_gdb.hh
@@ -120,6 +120,7 @@ class RemoteGDB : public BaseRemoteGDB
   public:
     RemoteGDB(System *_system, int _port);
     BaseGdbRegCache *gdbRegs() override;
+    bool checkBpLen(size_t len) override;
     std::vector<std::string>
     availableFeatures() const override
     {