diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99fda4d0..ab7b674d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,6 +217,10 @@ if(DS2_ARCHITECTURE MATCHES "ARM|ARM64")
 
     Sources/Core/ARM/HardwareBreakpointManager.cpp
     Sources/Core/ARM/SoftwareBreakpointManager.cpp)
+  set_source_files_properties(
+    Sources/Architecture/ARM/ThumbBranchInfo.cpp
+    PROPERTIES
+      COMPILE_OPTIONS $<$<CXX_COMPILER_ID:Clang>:-Wno-error=comma>)
 
   target_sources(ds2 PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR}/Headers/DebugServer2/Architecture/ARM/RegistersDescriptors.h
diff --git a/Sources/Core/ARM/HardwareBreakpointManager.cpp b/Sources/Core/ARM/HardwareBreakpointManager.cpp
index 9c9e6faf..7ec25b0d 100644
--- a/Sources/Core/ARM/HardwareBreakpointManager.cpp
+++ b/Sources/Core/ARM/HardwareBreakpointManager.cpp
@@ -19,17 +19,17 @@ namespace ds2 {
 
 int HardwareBreakpointManager::hit(Target::Thread *thread, Site &site) {
   return -1;
-};
+}
 
 ErrorCode HardwareBreakpointManager::enableLocation(Site const &site, int idx,
                                                     Target::Thread *thread) {
   return kErrorUnsupported;
-};
+}
 
 ErrorCode HardwareBreakpointManager::disableLocation(int idx,
                                                      Target::Thread *thread) {
   return kErrorUnsupported;
-};
+}
 
 size_t HardwareBreakpointManager::maxWatchpoints() {
   return _process->getMaxWatchpoints();