summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Rowe <mark@vector35.com>2026-03-24 18:27:28 -0700
committerMark Rowe <mark@vector35.com>2026-03-30 09:03:00 -0700
commitdca922496f96d18f9060b1f7a349ecb5c1c1a9a1 (patch)
treea60c70c6329104e808d6a8189f50edc62ca41ada
parent5a99579b1a903d3738bb82450ec40c52f1ea5594 (diff)
Fix compiler warnings seen with Clang 21
-rw-r--r--arch/armv7/CMakeLists.txt2
-rw-r--r--arch/armv7/arch_armv7.cpp6
-rw-r--r--demangler/gnu3/demangle_gnu3.cpp2
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();