From dca922496f96d18f9060b1f7a349ecb5c1c1a9a1 Mon Sep 17 00:00:00 2001
From: Mark Rowe <mark@vector35.com>
Date: Tue, 24 Mar 2026 18:27:28 -0700
Subject: Fix compiler warnings seen with Clang 21

---
 arch/armv7/CMakeLists.txt        | 2 +-
 arch/armv7/arch_armv7.cpp        | 6 ++----
 demangler/gnu3/demangle_gnu3.cpp | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/armv7/CMakeLists.txt b/arch/armv7/CMakeLists.txt
index 25847dfe..1e899d01 100644
--- a/arch/armv7/CMakeLists.txt
+++ b/arch/armv7/CMakeLists.txt
@@ -44,7 +44,7 @@ if(BN_INTERNAL_BUILD)
 		RUNTIME_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR})
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
 	target_compile_options(arch_armv7 PRIVATE
 		$<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>
 	)
diff --git a/arch/armv7/arch_armv7.cpp b/arch/armv7/arch_armv7.cpp
index f9fc250e..9f7831a2 100644
--- a/arch/armv7/arch_armv7.cpp
+++ b/arch/armv7/arch_armv7.cpp
@@ -884,12 +884,10 @@ protected:
 		const InstructionOperand& op,
 		vector<InstructionTextToken>& result)
 	{
-		const char* reg = NULL;
-		reg = GetRegisterName((enum Register)op.reg).c_str();
-		if (reg == NULL)
+		auto reg = GetRegisterName((enum Register)op.reg);
+		if (reg.empty())
 			return FAILED_TO_DISASSEMBLE_REGISTER;
 
-
 		result.emplace_back(RegisterToken, reg);
 		tokenize_shift(op, result);
 		return DISASM_SUCCESS;
diff --git a/demangler/gnu3/demangle_gnu3.cpp b/demangler/gnu3/demangle_gnu3.cpp
index 27054433..f2130a4e 100644
--- a/demangler/gnu3/demangle_gnu3.cpp
+++ b/demangler/gnu3/demangle_gnu3.cpp
@@ -471,7 +471,7 @@ DemangledTypeNode DemangleGNU3::DemangleFunction(bool cnst, bool vltl)
 	old_isparam = m_isParameter;
 	m_isParameter = true;
 	m_functionSubstitute.push_back({});
-	int i = 0;
+	[[maybe_unused]] int i = 0;
 	while (m_reader.Peek() != 'E')
 	{
 		DemangledTypeNode param = DemangleType();
-- 
cgit v1.3.1