summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDavid Laight <david.laight.linux@gmail.com>2025-03-31 21:26:42 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-04-10 14:44:36 +0200
commitffb8e7f715c4761774730b6efba2c113ec8b5da0 (patch)
tree3e7771b2d040ba2e5baca9af0e17a5ad156318a5 /tools
parent9cd3b09d02fd59f015e16dc05a3eb25157487c96 (diff)
downloadlinux-ffb8e7f715c4761774730b6efba2c113ec8b5da0.tar.gz
linux-ffb8e7f715c4761774730b6efba2c113ec8b5da0.tar.bz2
linux-ffb8e7f715c4761774730b6efba2c113ec8b5da0.zip
objtool: Fix verbose disassembly if CROSS_COMPILE isn't set
[ Upstream commit e77956e4e5c11218e60a1fe8cdbccd02476f2e56 ] In verbose mode, when printing the disassembly of affected functions, if CROSS_COMPILE isn't set, the objdump command string gets prefixed with "(null)". Somehow this worked before. Maybe some versions of glibc return an empty string instead of NULL. Fix it regardless. [ jpoimboe: Rewrite commit log. ] Fixes: ca653464dd097 ("objtool: Add verbose option for disassembling affected functions") Signed-off-by: David Laight <david.laight.linux@gmail.com> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/20250215142321.14081-1-david.laight.linux@gmail.com Link: https://lore.kernel.org/r/b931a4786bc0127aa4c94e8b35ed617dcbd3d3da.1743481539.git.jpoimboe@kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/objtool/check.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index aa071017c325..159fb130e282 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -4489,6 +4489,8 @@ static int disas_funcs(const char *funcs)
char *cmd;
cross_compile = getenv("CROSS_COMPILE");
+ if (!cross_compile)
+ cross_compile = "";
objdump_str = "%sobjdump -wdr %s | gawk -M -v _funcs='%s' '"
"BEGIN { split(_funcs, funcs); }"