Commit 5225952d authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Ingo Molnar
Browse files

x86/tools: Remove chkobjdump.awk 



This check is superfluous now that the minimum version of binutils to
build the kernel is 2.25. This also fixes an error seen with
llvm-objdump because it does not support '-v' prior to LLVM 13:

  llvm-objdump: error: unknown argument '-v'

Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://github.com/llvm/llvm-project/commit/dde24a87c55f82d8c7b3bf3eafb10f2b9b2b9a01
Link: https://lore.kernel.org/r/20231129-objdump-reformat-llvm-v3-3-0d855e79314d@kernel.org
Closes: https://github.com/ClangBuiltLinux/linux/issues/1362
parent f4570ebd

arch/x86/tools/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ reformatter = $(srctree)/arch/x86/tools/objdump_reformat.awk 
chkobjdump = $(srctree)/arch/x86/tools/chkobjdump.awk



quiet_cmd_posttest = TEST    $@

      cmd_posttest = ($(OBJDUMP) -v | $(AWK) -f $(chkobjdump)) || $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(reformatter) | $(obj)/insn_decoder_test $(posttest_64bit) $(posttest_verbose)

      cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(reformatter) | $(obj)/insn_decoder_test $(posttest_64bit) $(posttest_verbose)



quiet_cmd_sanitytest = TEST    $@

      cmd_sanitytest = $(obj)/insn_sanity $(posttest_64bit) -m 1000000

arch/x86/tools/chkobjdump.awk

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
# GNU objdump version checker

#

# Usage:

# objdump -v | awk -f chkobjdump.awk

BEGIN {

	# objdump version 2.19 or later is OK for the test.

	od_ver = 2;

	od_sver = 19;

}



/^GNU objdump/ {

	verstr = ""

	gsub(/\(.*\)/, "");

	for (i = 3; i <= NF; i++)

		if (match($(i), "^[0-9]")) {

			verstr = $(i);

			break;

		}

	if (verstr == "") {

		printf("Warning: Failed to find objdump version number.\n");

		exit 0;

	}

	split(verstr, ver, ".");

	if (ver[1] > od_ver ||

	    (ver[1] == od_ver && ver[2] >= od_sver)) {

		exit 1;

	} else {

		printf("Warning: objdump version %s is older than %d.%d\n",

		       verstr, od_ver, od_sver);

		print("Warning: Skipping posttest.");

		# Logic is inverted, because we just skip test without error.

		exit 0;

	}

}