From nobody Mon May 11 04:52:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E64FFC433F5 for ; Thu, 14 Apr 2022 09:14:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241590AbiDNJQy (ORCPT ); Thu, 14 Apr 2022 05:16:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234205AbiDNJQp (ORCPT ); Thu, 14 Apr 2022 05:16:45 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E613B0A; Thu, 14 Apr 2022 02:14:21 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id EFD1D1F746; Thu, 14 Apr 2022 09:14:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1649927659; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=HBZ9ag92vmSkbFZGj+8KyYeKwAJ+IyyeUDHDn026V54=; b=SsizxRShb0DalAHnZsiLhRQUoCZ9HSV0NdQguKLc3u5/6z8lHfxaG7Jznimz/wH0SCII1f qLfZRkfPnG0EtoEz1AFgPhYp3vICKrA/KMuxc4c+NTcBx78UmwUk67QMIwXtWbJsw1CCq2 gd2zlZLo74H4vzB/AIT/8EuJXc0Za1w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1649927659; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=HBZ9ag92vmSkbFZGj+8KyYeKwAJ+IyyeUDHDn026V54=; b=BOZ9bmdrt8+j0bZ7Hs5lKQKZPoHn2lJ56RtVkGerOwtEllCEM0kw6+TRHIHeRrXHceZsa6 pOpKAxCETUJ+EOBA== Received: from localhost.localdomain (unknown [10.100.201.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id B1F8BA3B82; Thu, 14 Apr 2022 09:14:19 +0000 (UTC) From: Jiri Slaby To: masahiroy@kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Slaby , Michal Marek , Nick Desaulniers , linux-kbuild@vger.kernel.org Subject: [PATCH] scripts: dummy-tools, add pahole Date: Thu, 14 Apr 2022 11:14:19 +0200 Message-Id: <20220414091419.7654-1-jslaby@suse.cz> X-Mailer: git-send-email 2.35.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" CONFIG_PAHOLE_VERSION is a part of a config since the commit below. And when multiple people update the config, this value constantly changes. Even if they use dummy scripts. To fix this: * add a pahole dummy script returning v99.99 -> 9999 * call it in Makefile taking CROSS_COMPILE into account. The latter happens only if $(CROSS_COMPILE)pahole really exists. This is because a cross pahole likely exists only in dummy tools now, not in real cross tools. Fixes: 613fe1692377 (kbuild: Add CONFIG_PAHOLE_VERSION) Cc: Masahiro Yamada Cc: Michal Marek Cc: Nick Desaulniers Cc: linux-kbuild@vger.kernel.org Signed-off-by: Jiri Slaby --- Makefile | 2 +- scripts/dummy-tools/pahole | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 scripts/dummy-tools/pahole diff --git a/Makefile b/Makefile index ecbd42f3451a..2ef722ba0a41 100644 --- a/Makefile +++ b/Makefile @@ -502,7 +502,7 @@ RUSTFMT =3D rustfmt CLIPPY_DRIVER =3D clippy-driver BINDGEN =3D bindgen CARGO =3D cargo -PAHOLE =3D pahole +PAHOLE =3D $(if $(wildcard $(CROSS_COMPILE)pahole),$(CROSS_COMPILE)pahole= ,pahole) RESOLVE_BTFIDS =3D $(objtree)/tools/bpf/resolve_btfids/resolve_btfids LEX =3D flex YACC =3D bison diff --git a/scripts/dummy-tools/pahole b/scripts/dummy-tools/pahole new file mode 100755 index 000000000000..53501a36fa71 --- /dev/null +++ b/scripts/dummy-tools/pahole @@ -0,0 +1,4 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-only + +echo v99.99 --=20 2.35.2