Skip to content

Commit f4570eb

Browse files
samzeteringomolnar
authored andcommitted
x86/tools: objdump_reformat.awk: Allow for spaces
GNU objdump and LLVM objdump have differing output formats. Specifically, GNU objump will format its output as: address:<tab>hex, whereas LLVM objdump displays its output as address:<space>hex. objdump_reformat.awk incorrectly handles this discrepancy due to the unexpected space and as a result insn_decoder_test fails, as its input is garbled. The instruction line being tokenized now handles a space and colon, or tab delimiter. Signed-off-by: Samuel Zeter <samuelzeter@gmail.com> Signed-off-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Tested-by: Nathan Chancellor <nathan@kernel.org> Tested-by: Kees Cook <keescook@chromium.org> Reviewed-by: Kees Cook <keescook@chromium.org> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Link: https://lore.kernel.org/r/20231129-objdump-reformat-llvm-v3-2-0d855e79314d@kernel.org Closes: ClangBuiltLinux#1364
1 parent 60c2ea7 commit f4570eb

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/x86/tools/objdump_reformat.awk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ BEGIN {
2222
}
2323

2424
/^ *[0-9a-f]+:/ {
25-
if (split($0, field, "\t") < 3) {
25+
if (split($0, field, /: |\t/) < 3) {
2626
# This is a continuation of the same insn.
2727
prev_hex = prev_hex field[2]
2828
} else {

0 commit comments

Comments
 (0)