From patchwork Thu Nov 30 08:51:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 171778 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp243042vqy; Thu, 30 Nov 2023 00:51:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IGx8PgK5vEyWoiEg74a3QJFz5XAdd9LhpUMW7AnRzTjGmfRWfXiMa8ao3SoL/Fbkg4Fc2a6 X-Received: by 2002:a17:90b:4a8f:b0:285:a118:3460 with SMTP id lp15-20020a17090b4a8f00b00285a1183460mr14630638pjb.3.1701334303856; Thu, 30 Nov 2023 00:51:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701334303; cv=none; d=google.com; s=arc-20160816; b=ln5HHM6vUUSzPEMFZoSeFo69YezjDLvpaf79ykCujHGprP+SkzzNgHsV2tbvzbwBiI FpR58LNOZHBzqGqSlmJo4HEI+atUUzg1ThLtH+15Z+TY55TQaesFaShHap+/nY6gVpSg 1AP15qTLsZOsNJUv5Q5PGA2mYmwFM7k8udtJMC27fgOAA8Y7G0eWBX9OFBKQwG46S3Wx I6S3tQog3YCg6Teb+ocSK+lmB6MPDR/o9OnzBx0Nq+OwlQe3OFwQKowxOXBUxDTQ1hvg YBzTl29hbqWnunzirfi8UBOR+5lwOC2Pf38hCTf2BHP+tbZueJYSahzKvwMzo5wKEHO6 2LYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=eUdTvOEPs2S9No28jSLuPsp1FLVFo0Rm9xlD7Lb41/I=; fh=ZXcv9fM7/4rh+w6iU5ThfIB0kAjnGshFSiUWeywea48=; b=CIv+8aOPI/82pQUV+cUO9XaeTTFWlvVeosB/0K6evdp03qVl4HQdAgUw2oLX608TRP W4MVIjzbW9pHem2OXpuoirTJhnMjSlb55WdLBjjlG1ngvoQzvF7jFxybZlj+N8tNzpRo ks+or8bZ+2dVr3Zhj97TxeboPMH0HYBhbq1Ux42aB/uk/4YX6J+jgioDwS56XfhE4Kq/ Lih3Ma/5HvWgXEuwYrgERp4TPrrDb67cq4ltyjSQ5A3Xoq/GvsBqUAoXPcnPXLp3iEg8 FTF1O08+4DFBXn0W2bgmikHXpXUd1/v+N6C7J+FKc891yPqkKzMShquzXRdFzVYMALwM jHQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=esjq3x6s; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id gt22-20020a17090af2d600b002851727a227si3164793pjb.32.2023.11.30.00.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 00:51:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=esjq3x6s; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id C10F1804B294; Thu, 30 Nov 2023 00:51:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231846AbjK3Ivb (ORCPT + 99 others); Thu, 30 Nov 2023 03:51:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229758AbjK3Iva (ORCPT ); Thu, 30 Nov 2023 03:51:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C07D10D1; Thu, 30 Nov 2023 00:51:35 -0800 (PST) Date: Thu, 30 Nov 2023 08:51:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701334293; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eUdTvOEPs2S9No28jSLuPsp1FLVFo0Rm9xlD7Lb41/I=; b=esjq3x6sM7QObKd550sJzKaPxi6LRDLwrhJJidkv2L074ZnVZfheoh4Evwaoeb2bAiqpqn 1wuHGcQ1H+VJe+JUKYgsRhAHevDk6KVN+HOmvAxCbxiGSPBPX1xdfGDxE8hkYp+ei30l48 4Qq6jqDfztaiDMPkdQYCFiTs8Q+ZjSz1mX0GLdhRRKRjeQh8ySgMHnEr+8canrdt82IuA9 FrK27nKRhUfrvpCmCsWBHX52Up+VtTAi64OtVxvo06NFOxmkh2IPh97eBP+Jx+ThGJJULl HsT0QosUrhXH7/Eich/QI3fWZnsinni7PvCiUX7Buazc3QszbmkkRpAvuseXpA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701334293; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eUdTvOEPs2S9No28jSLuPsp1FLVFo0Rm9xlD7Lb41/I=; b=IGPufNnRLJwxPh2/n/JJCgynSnooIg8/3K/8LRZ+mQwFVsPyso0dW+ReGv2b9KNdI/kRsN Di9apj3QzBurRwCQ== From: "tip-bot2 for Nathan Chancellor" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/build] x86/tools: Remove chkobjdump.awk Cc: Nathan Chancellor , Ingo Molnar , Kees Cook , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231129-objdump-reformat-llvm-v3-3-0d855e79314d@kernel.org> References: <20231129-objdump-reformat-llvm-v3-3-0d855e79314d@kernel.org> MIME-Version: 1.0 Message-ID: <170133429300.398.16123263998836409962.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 30 Nov 2023 00:51:40 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783938464826733327 X-GMAIL-MSGID: 1783978319082717011 The following commit has been merged into the x86/build branch of tip: Commit-ID: 5225952d74d43e4c054731c74b8afd700b23a94a Gitweb: https://git.kernel.org/tip/5225952d74d43e4c054731c74b8afd700b23a94a Author: Nathan Chancellor AuthorDate: Wed, 29 Nov 2023 15:17:43 -07:00 Committer: Ingo Molnar CommitterDate: Thu, 30 Nov 2023 09:38:12 +01:00 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 Signed-off-by: Ingo Molnar Tested-by: Kees Cook Reviewed-by: Kees Cook 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 --- arch/x86/tools/Makefile | 2 +- arch/x86/tools/chkobjdump.awk | 34 +---------------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 arch/x86/tools/chkobjdump.awk diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile index 90e820a..7278e25 100644 --- 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 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; - } -}