Remove .llvm suffix, so that we can correlate foo.llvm.<hash 1> and foo.llvm.<hash 2>.
Signed-off-by: Song Liu <[email protected]> --- tools/objtool/elf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c index d66452d66fb4..efb13ec0a89d 100644 --- a/tools/objtool/elf.c +++ b/tools/objtool/elf.c @@ -455,10 +455,15 @@ static int read_sections(struct elf *elf) static ssize_t demangled_name_len(const char *name) { ssize_t len; + const char *p; if (!strstarts(name, "__UNIQUE_ID_") && !strchr(name, '.')) return strlen(name); + p = strstr(name, ".llvm."); + if (p) + return p - name; + for (len = strlen(name) - 1; len >= 0; len--) { char c = name[len]; @@ -482,6 +487,9 @@ static ssize_t demangled_name_len(const char *name) * __UNIQUE_ID_addressable___UNIQUE_ID_pci_invalid_bar_694_695 * * to remove both trailing numbers, also remove trailing '_'. + * + * For symbols with llvm suffix, i.e., foo.llvm.<hash>, remove the + * .llvm.<hash> part. */ static const char *demangle_name(struct symbol *sym) { -- 2.47.3
