From d026e1e23fe5e7ab4246539c5d3d584869560ae4 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 11 May 2025 20:33:36 -0700 Subject: [PATCH 1/2] ARM: address -Werror=c++98-compat-extra-semi Clean up some extraneous `;` which trigger a c++98-compat-extra-semi warning, which is subsequently treated as an error. --- Sources/Core/ARM/HardwareBreakpointManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(); From 74800d58dc871863479abde276a71560b1e4eab7 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 11 May 2025 20:41:08 -0700 Subject: [PATCH 2/2] ARM: ignore -Werror=comma We use the comma operator to compress the vertical width of the file. Ignore the error that this introduces due to `-Werror`. --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) 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 $<$:-Wno-error=comma>) target_sources(ds2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/Headers/DebugServer2/Architecture/ARM/RegistersDescriptors.h