From 326fe7b28233934d00ae4089ad5e99261c885bdb Mon Sep 17 00:00:00 2001 From: Mason Reed Date: Fri, 22 Nov 2024 17:38:22 -0500 Subject: Fix CXXABI postfixed externs being duplicated in ELF --- view/elf/elfview.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'view/elf/elfview.cpp') diff --git a/view/elf/elfview.cpp b/view/elf/elfview.cpp index fb6942e3..78e31ad7 100644 --- a/view/elf/elfview.cpp +++ b/view/elf/elfview.cpp @@ -2413,6 +2413,13 @@ void ElfView::DefineElfSymbol(BNSymbolType type, const string& incomingName, uin name = name.substr(0, pos); } + pos = name.rfind("@CXXABI"); + if (type == ExternalSymbol && pos != string::npos) + { + name = name.substr(0, pos); + } + + // Deprioritize local label symbol names if (type == DataSymbol && binding == LocalBinding && !name.empty() && name[0] == '.') { -- cgit v1.3.1