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: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Kees 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

diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
index 90e820ac9771fe0dafe962bf4949dcead4ba0eb0..7278e2545c3500d6022663d46e8e928c5f2d0ab8 100644 (file)
--- a/arch/x86/tools/Makefile
+++ b/arch/x86/tools/Makefile
@@ -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

diff --git a/arch/x86/tools/chkobjdump.awk b/arch/x86/tools/chkobjdump.awk
deleted file mode 100644 (file)
index a4cf678..0000000
--- a/arch/x86/tools/chkobjdump.awk
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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;
-       }
-}