From nobody Sat Jul 25 16:48:58 2026 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4123639891D for ; Wed, 15 Jul 2026 14:54:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784127264; cv=none; b=hJob4Uwq+IuXql+pQMRjKCWE+Xjksk4cjAD7utkFFNM3a70Ia46ps0NMaRW/94AyrCKb609KRoIXeOxx8w9d7666L9nyKOvU6pVr8AFZXzE8nKcK4PvHnooyZW55o6hj1GiTqt2K8ENyudospdVkGSgCd65alLwd6my4mpCGb24= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784127264; c=relaxed/simple; bh=6unCx+x2NPgOEvMqAsB5BwetJseNsn7+XOk6L5xpusA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UAEN4IvPy1m32yGWOZ1V8FI5yLUzQ11o5bHmnNBAdLJIm5m0Xxap/sZFYVGFzaf2vfDlLfyuhr33aBg2ckEyZFOGlSsG8XvdaNsqUWt+/rwyFmh5dH0VDavuFPMoN53ygQKJJ3qq19Bz1vutR+4telRo6mDq9WrFYU1KnxjvyRQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=UbucEKqP; arc=none smtp.client-ip=209.85.221.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UbucEKqP" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-47362928f65so5052447f8f.2 for ; Wed, 15 Jul 2026 07:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1784127258; x=1784732058; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=L41MYl3HjuzLNuK2qp3MB7sFO80z4n0DLrf9pnL8oBE=; b=UbucEKqPri0Y7UUkalOBWhDbpAh/wngXkbJ4m0AKmeH2D1R2qONQlUx33H79u9kaha Y+XxU5HR2f/E2Luw9HUCl4Pw1Bz8W2vu9dtnGhTA2RVG0f2B7eW/Txlbw/LiQfmge1/8 LfFTiql60yxQVzuO9O32XSiAvmsCIa8a+lRUE12Jva1I7043aqxbYM9z30YHB8+nDVYi jj1WOuMxh+lurXITU7rZ/vi6S5wZFxcGhM4nU9R+ozErlazUsAKuln3jeBUl99IfqTOh m68bAIx9ungrcP1SjKb+OE8dvifZhdzlvw9IoHcw/w4MRHvncPsyozRllsZ/m2rCHhTN Cz0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784127258; x=1784732058; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=L41MYl3HjuzLNuK2qp3MB7sFO80z4n0DLrf9pnL8oBE=; b=jM47wHPT3bXKD6HfWJd9UwLzOs0G0FVTyrwsSt7e7XKc9XDigxFphf3VmBdyNHcfFg W+SYQZ75f7j9S5kSqxZblQzT4ehAahaUdVxt6lmchp8PFkAZ4UJndIHtn7OW9vZV3iv1 G0Q9IFy0YaEWgHU7mtHdIP5bp0GDKSpo3Xgao3vEMQjbuW5voc4t5cz06ifnPiozSHD3 sH2KcFHenHdfTzSpUl7aQ01yOOwZDpmhsrUzeIOTnYlG8HL6EsaoY6d0O/FiqsJ/SYCm NIvpJebbvVW67wl4E3SVSDgoNcNhqehr45/IjT+V0ogdyLUXvWYsoL+dzwv5Au0ComZZ f7fA== X-Forwarded-Encrypted: i=1; AHgh+RrRPnsZut9zHz0LUFxBfu+zEytcgRJ90DqIo848WbaZqS8XXncn0jXK7aWcuNB+clmEBFdiBzlFl60tGHU=@vger.kernel.org X-Gm-Message-State: AOJu0YyWw8UVMyJxuvUnLjXGxvOUQLoWIOrV7x9kQMLG6W9AYTTcdtPS DkGogaw79R76KMTzBuURr/pRyA5TsesXlb0dEbfST/ijqsI1hVLZygml8LVolU8lDh8= X-Gm-Gg: AfdE7ckRwMPgwvnn1vwBOIN/UpprBlPZCCp6x/ucyFIvGWdRp+poJSnAnCKibJ1kXze 1roTlkhj+yMFVpVy+uZd222RoYj+WykoE4xWMazDWUgv4tw8Yz96QsS4nbxgSP5npsVJqFYXLvH trAECx4Nr6N7Y6AVtaQxN+EnFLI3tCYTeNayTG3Sn9WJHvd2tUCIbB5uy6E3umuxnfK56vWIBwd JfKDusIKfgiHc4FhRsescowgQvuzw7Ax878wjZ6upegAiEZZ5+OjEtlRilZxzCyNEVf86EuVgxy O3AcIMxwmN2dqGGzpvRb3p6ZT7Wf2yRLzbgFUR/gwFEPRIUtEVK3dX1WDXIYUYiuU5MVe8lB9En iuIJGEQmfvqHvdQOkoADnCZOlDSTTS46Q6Xe52BoESqUDhhem5yHU28a3XanrpEg5KM8N1ZLkQT jYP/l/6GEPqOyzryiPvbSSIcWqNb08cdIn X-Received: by 2002:a05:600c:8487:b0:495:3a56:bd3 with SMTP id 5b1f17b1804b1-4953a560c74mr55833245e9.20.1784127257756; Wed, 15 Jul 2026 07:54:17 -0700 (PDT) Received: from e133063.arm.com ([212.187.182.162]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49510c8e220sm137649275e9.15.2026.07.15.07.54.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 07:54:17 -0700 (PDT) From: James Clark Date: Wed, 15 Jul 2026 15:53:48 +0100 Subject: [PATCH v4 1/4] tools/build: Allow versioning of all LLVM tools defined in Makefile.include Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260715-james-perf-llvm-version-v4-1-6dfdf984b435@linaro.org> References: <20260715-james-perf-llvm-version-v4-0-6dfdf984b435@linaro.org> In-Reply-To: <20260715-james-perf-llvm-version-v4-0-6dfdf984b435@linaro.org> To: Arnaldo Carvalho de Melo , Namhyung Kim , Ihor Solodrai Cc: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Ian Rogers , Adrian Hunter , Shuah Khan , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, James Clark X-Mailer: b4 0.14.2 The version of LLVM tools can be given on the build command with LLVM=3D-15, but this isn't applied to all tools. For example $(CC) gets versioned, but $(CLANG) doesn't. This causes a Perf build with LTO=3D1 to fail with an error about mixed clang versions: ld.lld: error: libperf/core.o: Unknown attribute kind (86) (Producer: 'LLVM18.1.8' Reader: 'LLVM 15.0.7') This file has two "ifneq ($(LLVM),)" blocks adjacent to each other, so merge these blocks making it obvious that all tools should be versioned consistently and there is nothing special about each block. This also reveals that ?=3D and "allow-override" are used inconsistently between the blocks. "allow-override" is technically only required for builtin variables, but isn't only used on them, and doesn't do any harm if used on a non-builtin. Make them all "allow-override" for consistency. The only functional difference this will cause is if there is a file level definition of one of the variables followed by an "#include of Makefile.include" which will now overwrite. But this isn't done and in a later commit some of the duplicate definitions will be removed for good measure. There are also some other LLVM tools that are not defined here and will be moved in a later commit. Signed-off-by: James Clark Acked-by: Kumar Kartikeya Dwivedi Reviewed-by: Ian Rogers --- tools/scripts/Makefile.include | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 41971a68972dda218714d6b95b1d9d92349285c3..7022e78208a236604a681d45b1f= f4f2128f412e5 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -61,10 +61,18 @@ $(error Invalid value for LLVM, see Documentation/kbuil= d/llvm.rst) endif =20 $(call allow-override,CC,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) +$(call allow-override,CLANG,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) +$(call allow-override,HOSTCC,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) $(call allow-override,AR,$(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX)) +$(call allow-override,HOSTAR,$(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX)) $(call allow-override,LD,$(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX)) +$(call allow-override,HOSTLD,$(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX)) $(call allow-override,CXX,$(LLVM_PREFIX)clang++$(LLVM_SUFFIX)) $(call allow-override,STRIP,$(LLVM_PREFIX)llvm-strip$(LLVM_SUFFIX)) +$(call allow-override,LLVM_STRIP,$(LLVM_PREFIX)llvm-strip$(LLVM_SUFFIX)) +$(call allow-override,LLC,$(LLVM_PREFIX)llc$(LLVM_SUFFIX)) +$(call allow-override,LLVM_CONFIG,$(LLVM_PREFIX)llvm-config$(LLVM_SUFFIX)) +$(call allow-override,LLVM_OBJCOPY,$(LLVM_PREFIX)llvm-objcopy$(LLVM_SUFFIX= )) else # Allow setting various cross-compile vars or setting CROSS_COMPILE as a p= refix. $(call allow-override,CC,$(CROSS_COMPILE)gcc) @@ -72,26 +80,21 @@ $(call allow-override,AR,$(CROSS_COMPILE)ar) $(call allow-override,LD,$(CROSS_COMPILE)ld) $(call allow-override,CXX,$(CROSS_COMPILE)g++) $(call allow-override,STRIP,$(CROSS_COMPILE)strip) -endif - -CC_NO_CLANG :=3D $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__= "; echo $$?) =20 -ifneq ($(LLVM),) -HOSTAR ?=3D $(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX) -HOSTCC ?=3D $(LLVM_PREFIX)clang$(LLVM_SUFFIX) -HOSTLD ?=3D $(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX) -else -HOSTAR ?=3D ar -HOSTCC ?=3D gcc -HOSTLD ?=3D ld +# Host versions aren't prefixed +$(call allow-override,HOSTAR,ar) +$(call allow-override,HOSTCC,gcc) +$(call allow-override,HOSTLD,ld) + +# Some tools still require Clang, LLC and/or LLVM utils +$(call allow-override,CLANG,clang) +$(call allow-override,LLC,llc) +$(call allow-override,LLVM_CONFIG,llvm-config) +$(call allow-override,LLVM_OBJCOPY,llvm-objcopy) +$(call allow-override,LLVM_STRIP,llvm-strip) endif =20 -# Some tools require Clang, LLC and/or LLVM utils -CLANG ?=3D clang -LLC ?=3D llc -LLVM_CONFIG ?=3D llvm-config -LLVM_OBJCOPY ?=3D llvm-objcopy -LLVM_STRIP ?=3D llvm-strip +CC_NO_CLANG :=3D $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__= "; echo $$?) =20 # Some tools require bpftool SYSTEM_BPFTOOL ?=3D bpftool --=20 2.34.1 From nobody Sat Jul 25 16:48:58 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30EB133F586 for ; Wed, 15 Jul 2026 14:54:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784127265; cv=none; b=ByJomx/Au1V3yd6iiDHnYnTaEx5ILof2LoeATFixTvn1XRMe/3YcdQt25Mbp4D8oA6iAhc/gL6+z2hCJJu2RlTfEq0ndJKVnpocFIBrB22FXiPPIETqS0+BoizvbKpJpN2Aq3rtodqkHGEaEaSdDH5mIwCx1Tmt19RENjlpymuo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784127265; c=relaxed/simple; bh=vierWn7zWoMEGxDcMMkTIOifh9Esb5HXc5nNQCPMiog=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pAt+maN4ek9WwL/+9jTiOEr6xFNRh1+Lg6SXkfuYW3eGdjck/BZzw7jOy0rtXuXX3y0gfCfQjMF3n/U4vMty+apntgzKn5FLEOOXveNTrALTY3tNjHyj8urE0FPnO9Gyai+q3Qz+uZCD9XdQSfmFlgiRJcp2zve2uogFS/pq5f8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=sNir0yfy; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="sNir0yfy" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-493b7612475so41945855e9.3 for ; Wed, 15 Jul 2026 07:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1784127259; x=1784732059; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=MEBbHm347NmLeqhspnJuPdrAD7nLfIZv8YQWBcbqgbU=; b=sNir0yfynPWRJOWDmx2+Dwgr6pw4vLlrkhosimT3MU12NwaeN2Mw90Smz8ssIJW96I Fe7HuXQsUHtxXq9TUGJzwy7Wu9LJf1OhXQ0IT1uruFzwPUsDmQilyV3+CZiQCpm9P6Fr 1lL9lvCA0JC7Kf7PSIK4Liya/f4gD5jebSH4B5PBGU2Hoc5wuM2T7nCUmUZyzb4U/r2v FehRc1/098kuDTY5I+kJ7UeX9WuGz8PpDKizpQtpe+HoQCJMEaeh3goyCZuR8f3Ilr24 YuQuDEnLrUm/H232N1pG9VAPJFbwlS2dVRwc2ILyzQR/2h7Wos58SLwI8N3V0/q0drqk p4pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784127259; x=1784732059; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=MEBbHm347NmLeqhspnJuPdrAD7nLfIZv8YQWBcbqgbU=; b=UJEaHtAld/DjR6hqFdBYUr4tUAp1wH5pfJsBs0+MmqoqVdcQLVSJbOjo7gMOYxti3K 9Imau5WngoOXKTIMdudOf2Mv+LP8HfCtgepAIuniaN6nxpT0iWzkN9mWJIZs9DmrHK1v JlN+ik1qCy9qm/arFFETfQRNFoMuF3bDIVvOIhZyf3d+WkpxbqSmDrRNleFTU9DBUFGR 3qTaeNdlDgzQq2A/UB3TSL2Dtxa9osmZ40PKQuDVmB1lbSY3o+jZc+PqftBq+QwrbUhM yRZOL67olMsQmCxUfHQngJXi8OTooyA8dpF0RG+g7E4nZSIQJMuMlsnsJnJdmbK6TXF5 02sA== X-Forwarded-Encrypted: i=1; AHgh+RoZLav3L4clH7CUcD2snTaKsQMvWbXAx9MNXcNmRlnncTmCL/XJKtUJY3Ff7cSE1oDJLO7EyjQWMAbAaDg=@vger.kernel.org X-Gm-Message-State: AOJu0Yzz1gBhqjgqxnnAYl6YubECsGOZzIb5wr6gHHNxJD8Q5qFyX/am c/G+B+GD1oAdftWfqUGSorFToq2Afgt4mxy+7sAvlOvEFzVknB9vbH9BPYhRgs4qs1c= X-Gm-Gg: AfdE7cm88Zf+7849Q48N46lDVzhHH0EezxiPUY1vvtPltWFPvODb+ukFIAq+80GUVuA rIO1CGxIs5HCY9+jWAnqldBhCMlf8mylnVcgwTZburOx051n+voNu0kYzgjuurjPioN53XWLGrQ d+T2F31setZVw/foXMFlaXGgzFqsmj2A120vet2S/IXCI07Z+8plfG2qvQsGoBU0/Du1CtlziAi RYSx+ivcSt8k1sfJ31CMrX6gM6Hy/PnX/1ySYaR/FpPE+KsvDy0ZeymNI+m1lCsAzsPcqbAZjeI vedhTcJoqeXKvZJUBrasc7pI4chn1TBQ9Bly7ETr77zbgWo1OPhU1EcsMvYWmy6DUt+x7Mc5bqp Zw/WnDcgYIRRAHbZuaNrnQ3y7w76Rg8goDW8eZaesSWqUIFS6Ra8OfBF4jzGWttXVrH7Uigi8us lyAtRIK9jfgyVSrzzBoSsZJQ== X-Received: by 2002:a05:600c:c16e:b0:493:c8cf:27bd with SMTP id 5b1f17b1804b1-49515904fa9mr98446325e9.19.1784127259252; Wed, 15 Jul 2026 07:54:19 -0700 (PDT) Received: from e133063.arm.com ([212.187.182.162]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49510c8e220sm137649275e9.15.2026.07.15.07.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 07:54:18 -0700 (PDT) From: James Clark Date: Wed, 15 Jul 2026 15:53:49 +0100 Subject: [PATCH v4 2/4] tools/build: Indent if else blocks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260715-james-perf-llvm-version-v4-2-6dfdf984b435@linaro.org> References: <20260715-james-perf-llvm-version-v4-0-6dfdf984b435@linaro.org> In-Reply-To: <20260715-james-perf-llvm-version-v4-0-6dfdf984b435@linaro.org> To: Arnaldo Carvalho de Melo , Namhyung Kim , Ihor Solodrai Cc: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Ian Rogers , Adrian Hunter , Shuah Khan , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, James Clark X-Mailer: b4 0.14.2 These blocks are quite big and unreadable without indentation. Indent them. No functional changes intended. Signed-off-by: James Clark Acked-by: Kumar Kartikeya Dwivedi Reviewed-by: Ian Rogers --- tools/scripts/Makefile.include | 76 +++++++++++++++++++++-----------------= ---- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 7022e78208a236604a681d45b1ff4f2128f412e5..e81e5b479c563321e458b2a7ad8= fca2b4607a254 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -52,46 +52,46 @@ define allow-override endef =20 ifneq ($(LLVM),) -ifneq ($(filter %/,$(LLVM)),) -LLVM_PREFIX :=3D $(LLVM) -else ifneq ($(filter -%,$(LLVM)),) -LLVM_SUFFIX :=3D $(LLVM) -else ifneq ($(LLVM),1) -$(error Invalid value for LLVM, see Documentation/kbuild/llvm.rst) -endif + ifneq ($(filter %/,$(LLVM)),) + LLVM_PREFIX :=3D $(LLVM) + else ifneq ($(filter -%,$(LLVM)),) + LLVM_SUFFIX :=3D $(LLVM) + else ifneq ($(LLVM),1) + $(error Invalid value for LLVM, see Documentation/kbuild/llvm.rst) + endif =20 -$(call allow-override,CC,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) -$(call allow-override,CLANG,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) -$(call allow-override,HOSTCC,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) -$(call allow-override,AR,$(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX)) -$(call allow-override,HOSTAR,$(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX)) -$(call allow-override,LD,$(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX)) -$(call allow-override,HOSTLD,$(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX)) -$(call allow-override,CXX,$(LLVM_PREFIX)clang++$(LLVM_SUFFIX)) -$(call allow-override,STRIP,$(LLVM_PREFIX)llvm-strip$(LLVM_SUFFIX)) -$(call allow-override,LLVM_STRIP,$(LLVM_PREFIX)llvm-strip$(LLVM_SUFFIX)) -$(call allow-override,LLC,$(LLVM_PREFIX)llc$(LLVM_SUFFIX)) -$(call allow-override,LLVM_CONFIG,$(LLVM_PREFIX)llvm-config$(LLVM_SUFFIX)) -$(call allow-override,LLVM_OBJCOPY,$(LLVM_PREFIX)llvm-objcopy$(LLVM_SUFFIX= )) + $(call allow-override,CC,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) + $(call allow-override,CLANG,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) + $(call allow-override,HOSTCC,$(LLVM_PREFIX)clang$(LLVM_SUFFIX)) + $(call allow-override,AR,$(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX)) + $(call allow-override,HOSTAR,$(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX)) + $(call allow-override,LD,$(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX)) + $(call allow-override,HOSTLD,$(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX)) + $(call allow-override,CXX,$(LLVM_PREFIX)clang++$(LLVM_SUFFIX)) + $(call allow-override,STRIP,$(LLVM_PREFIX)llvm-strip$(LLVM_SUFFIX)) + $(call allow-override,LLVM_STRIP,$(LLVM_PREFIX)llvm-strip$(LLVM_SUFFIX)) + $(call allow-override,LLC,$(LLVM_PREFIX)llc$(LLVM_SUFFIX)) + $(call allow-override,LLVM_CONFIG,$(LLVM_PREFIX)llvm-config$(LLVM_SUFFIX= )) + $(call allow-override,LLVM_OBJCOPY,$(LLVM_PREFIX)llvm-objcopy$(LLVM_SUFF= IX)) else -# Allow setting various cross-compile vars or setting CROSS_COMPILE as a p= refix. -$(call allow-override,CC,$(CROSS_COMPILE)gcc) -$(call allow-override,AR,$(CROSS_COMPILE)ar) -$(call allow-override,LD,$(CROSS_COMPILE)ld) -$(call allow-override,CXX,$(CROSS_COMPILE)g++) -$(call allow-override,STRIP,$(CROSS_COMPILE)strip) - -# Host versions aren't prefixed -$(call allow-override,HOSTAR,ar) -$(call allow-override,HOSTCC,gcc) -$(call allow-override,HOSTLD,ld) - -# Some tools still require Clang, LLC and/or LLVM utils -$(call allow-override,CLANG,clang) -$(call allow-override,LLC,llc) -$(call allow-override,LLVM_CONFIG,llvm-config) -$(call allow-override,LLVM_OBJCOPY,llvm-objcopy) -$(call allow-override,LLVM_STRIP,llvm-strip) + # Allow setting various cross-compile vars or setting CROSS_COMPILE as a= prefix. + $(call allow-override,CC,$(CROSS_COMPILE)gcc) + $(call allow-override,AR,$(CROSS_COMPILE)ar) + $(call allow-override,LD,$(CROSS_COMPILE)ld) + $(call allow-override,CXX,$(CROSS_COMPILE)g++) + $(call allow-override,STRIP,$(CROSS_COMPILE)strip) + + # Host versions aren't prefixed + $(call allow-override,HOSTAR,ar) + $(call allow-override,HOSTCC,gcc) + $(call allow-override,HOSTLD,ld) + + # Some tools still require Clang, LLC and/or LLVM utils + $(call allow-override,CLANG,clang) + $(call allow-override,LLC,llc) + $(call allow-override,LLVM_CONFIG,llvm-config) + $(call allow-override,LLVM_OBJCOPY,llvm-objcopy) + $(call allow-override,LLVM_STRIP,llvm-strip) endif =20 CC_NO_CLANG :=3D $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__= "; echo $$?) --=20 2.34.1 From nobody Sat Jul 25 16:48:58 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC7A93998B2 for ; Wed, 15 Jul 2026 14:54:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784127266; cv=none; b=kEU70v8WYAu+z2mG9t1cbFXYv5gGDI1qSpOacLFoAgIKLsCscwMIzDl9ukgZuF0aGYoNLytVGoD5QQcZx1mbVA3Gw+XlY7cKdumxdwsoocH9qrWY2onz12cHYNYvYJPURyexOxqjwbkxiYRlEIQxLHJM/LdNtJaIxRRVueluFQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784127266; c=relaxed/simple; bh=ZkYJs35jQmspYZV+7P7rdW/XJsOQuNs1+0xfbRaBumg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MVglDCHPnQxyR4caBR3ZDh+++2Lj2prG1YB+om1PSyhrkPk7YzB/yK2PTvOZP1qnaohz5HHKwm6g8zEof7FtJEAc4Zumhr3/VIY8NqCKGHu/8RV9c2nSXKw9mB0R4JRAU2LaSEq8D1cLDoHPIUGUEaX9tsiqh5uxHORhVw0vkKA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=w9I+eCnr; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="w9I+eCnr" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-493f75f7172so39020225e9.1 for ; Wed, 15 Jul 2026 07:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1784127261; x=1784732061; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=IYLoZSOwmX0k8MESmwiGJgNO1yzq3b1PVclurYMHFiw=; b=w9I+eCnr9TIpzu7GbUYL3zpPPIU6S0jloT5X6VGAEDiz/7On9oUBC23OrWcWvwJ3Fy XXhPEmRuAu3TMYM8U2QxRjA4rolyrFrxVozlWwpikuqabKxeg0js85iTK/h7nEf5IRgd LcnzjFcNHDDCslPC90GT19wToUdJDkJHj3s1rSsyofjcMLccC/pa3ga+ys+OPCU72DuS Cja0PTk2CeXJg/G8pS/IvOLQ+dsngjm2wUO6UFSBKOJwN/KQA33pxuLDIF9+6vHZYueg L5G9Rw4rpjuITSIDatvLu8wO4rwsQsGThqrdPO8P5WGw8DUDGMlz1+wruJOHQjDDvGgT HbRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784127261; x=1784732061; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=IYLoZSOwmX0k8MESmwiGJgNO1yzq3b1PVclurYMHFiw=; b=T3xleTUrpphlsjH03X3q1tz8W/biXVFEiL+G0i+1SM7MBHn8ZNISiE+ocpP92GVabh +jBXNPjyOoS/g3cRbGnsmRfWAc/jEMGuVIh+bhh0DSanAqMANCdvRPExRMdt3ESpLx5w TVbWoAg8hpJnueG6/KWXpZbRPEK2cns3r0wgBkecXU6TQgxbdwDfyzy527sqybMtJ1zH Fe32NbGg9rBZ6Sq4gw8oD3t/mhAsNsbKPJWF1KE9xun2p1gLOByia6Ad5ZjBW9LZiHky pfYRG2AbaIy8FY2nNTeLdq0IBEXwKmaGGMGZpfIiFyX+R0Nfc4L8e0pMwWnhy+l3jqPE OLvw== X-Forwarded-Encrypted: i=1; AHgh+RoI1kNMtqXKPcsKNIJqcK5uvUlj3h62iAW9KLnKbPoryza/sBleu7lzlMAO/sV9WAajkuN2BVZ9QWebpP4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2KxE/sxddC0HtsXO8n8TbIpZYmFc83yQewyQUCdNi4jnh4Z0T KUYUPs0kWXh7cUeSgpiIxaJot2eBVYf//kozPiuSp+1HidmA6UpJnyEnedKApw3lXZg= X-Gm-Gg: AfdE7ckqlTeNLqJRJg1sHI7K+FHVaINhUW3wEVmz4dsZiXw03QjKJRklK9RjVpssz0O xsRmf9rODQ0imd01YcghKBgch4cjCDpJHSMSElVIkQBS1PnN0oZAa8m+DLAaRv5Ewge8HLxRWDJ 2EuzKlOGnU3YjRDa2pGTKd1gNhLePOTDNqLo6e7YzN1hosT8x7bmL7RtUYO7w+e1S7LkYmcc0PS EijnokcCJokhkhHmXn7Ny4k9HXAHGSzfAwWR9qoKjCh86OgXmxVoclYcJsLcjKPtEg/Iq3yUacj p/KFAJRAaslWuoS7cA6t5ozN2yFkMZXy+GKugkFPhDVh/wPngUUYqboniEENgDZvzL8w88PyyUq p8hayqvuRWn232rqtbrwgLXMRvcL9M08OdD98g9O2lFp1IPHW5j1Zh07SgkewVdAAPqjpCr7uWx 3qoT5RwxP+GSL1weVTHPyR0Q== X-Received: by 2002:a7b:c38e:0:b0:495:406c:81d5 with SMTP id 5b1f17b1804b1-495406c81ffmr2450405e9.28.1784127261341; Wed, 15 Jul 2026 07:54:21 -0700 (PDT) Received: from e133063.arm.com ([212.187.182.162]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49510c8e220sm137649275e9.15.2026.07.15.07.54.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 07:54:20 -0700 (PDT) From: James Clark Date: Wed, 15 Jul 2026 15:53:50 +0100 Subject: [PATCH v4 3/4] tools/build: Allow versioning LLVM readelf Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260715-james-perf-llvm-version-v4-3-6dfdf984b435@linaro.org> References: <20260715-james-perf-llvm-version-v4-0-6dfdf984b435@linaro.org> In-Reply-To: <20260715-james-perf-llvm-version-v4-0-6dfdf984b435@linaro.org> To: Arnaldo Carvalho de Melo , Namhyung Kim , Ihor Solodrai Cc: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Ian Rogers , Adrian Hunter , Shuah Khan , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, James Clark X-Mailer: b4 0.14.2 Documentation/kbuild/llvm.rst mentions that readelf is included in the LLVM toolchain, but it's not currently included in this block. Add it so that LLVM=3D... options also apply to readelf. Users in tools/ were Perf which was hardcoding it, and another was the BPF makefile. Both already include Makefile.include so convert them to use the new variables. Where readelf wasn't doing anything arch specific, use HOSTREADELF because it's more likely to be installed. Reviewed-by: Ian Rogers Signed-off-by: James Clark Acked-by: Ihor Solodrai Acked-by: Kumar Kartikeya Dwivedi --- tools/lib/bpf/Makefile | 8 ++++---- tools/perf/Makefile.perf | 1 - tools/scripts/Makefile.include | 4 ++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index eca584fb061e16013e76827e4203f6be0477a73e..269fe21fc8da73083367b3c122b= dd2b718e12bc5 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -115,12 +115,12 @@ PC_FILE :=3D $(addprefix $(OUTPUT),$(PC_FILE)) =20 TAGS_PROG :=3D $(if $(shell which etags 2>/dev/null),etags,ctags) =20 -GLOBAL_SYM_COUNT =3D $(shell readelf -s --wide $(BPF_IN_SHARED) | \ +GLOBAL_SYM_COUNT =3D $(shell $(HOSTREADELF) -s --wide $(BPF_IN_SHARED) | \ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ sed 's/\[.*\]//' | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}' | \ sort -u | wc -l) -VERSIONED_SYM_COUNT =3D $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.= so | \ +VERSIONED_SYM_COUNT =3D $(shell $(HOSTREADELF) --dyn-syms --wide $(OUTPUT)= libbpf.so | \ sed 's/\[.*\]//' | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}' | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) @@ -183,12 +183,12 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_SCRIPT) "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \ "Please make sure all LIBBPF_API symbols are" \ "versioned in $(VERSION_SCRIPT)." >&2; \ - readelf -s --wide $(BPF_IN_SHARED) | \ + $(HOSTREADELF) -s --wide $(BPF_IN_SHARED) | \ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ sed 's/\[.*\]//' | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ - readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ + $(HOSTREADELF) --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}'| \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 476b8dcaef58cb1f3fa75f46a647c2cfe2352767..4d0d7ae02e06b117487a17691c4= e62a138428ac5 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -215,7 +215,6 @@ FLEX ?=3D flex BISON ?=3D bison STRIP =3D strip AWK =3D awk -READELF ?=3D readelf =20 # include Makefile.config by default and rule out # non-config cases diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index e81e5b479c563321e458b2a7ad8fca2b4607a254..46a3872b87624a7bf475d9b42a3= e471f36789dfd 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -73,6 +73,8 @@ ifneq ($(LLVM),) $(call allow-override,LLC,$(LLVM_PREFIX)llc$(LLVM_SUFFIX)) $(call allow-override,LLVM_CONFIG,$(LLVM_PREFIX)llvm-config$(LLVM_SUFFIX= )) $(call allow-override,LLVM_OBJCOPY,$(LLVM_PREFIX)llvm-objcopy$(LLVM_SUFF= IX)) + $(call allow-override,READELF,$(LLVM_PREFIX)llvm-readelf$(LLVM_SUFFIX)) + $(call allow-override,HOSTREADELF,$(LLVM_PREFIX)llvm-readelf$(LLVM_SUFFI= X)) else # Allow setting various cross-compile vars or setting CROSS_COMPILE as a= prefix. $(call allow-override,CC,$(CROSS_COMPILE)gcc) @@ -80,11 +82,13 @@ else $(call allow-override,LD,$(CROSS_COMPILE)ld) $(call allow-override,CXX,$(CROSS_COMPILE)g++) $(call allow-override,STRIP,$(CROSS_COMPILE)strip) + $(call allow-override,READELF,$(CROSS_COMPILE)readelf) =20 # Host versions aren't prefixed $(call allow-override,HOSTAR,ar) $(call allow-override,HOSTCC,gcc) $(call allow-override,HOSTLD,ld) + $(call allow-override,HOSTREADELF,readelf) =20 # Some tools still require Clang, LLC and/or LLVM utils $(call allow-override,CLANG,clang) --=20 2.34.1 From nobody Sat Jul 25 16:48:58 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 369183A0B13 for ; Wed, 15 Jul 2026 14:54:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784127267; cv=none; b=J6Y0MoEJL4Ncem/M9NK5LdyJfyszKTGa62slVFhv+vzwnrtIRBl0Y10ac3MD8GY0in4iCyv+R3jQwu3+gPAJJDM03SR7lMsFv0UBrhe46TEBlKSLo9Ax9LQkyJ7UN1qGYPAU9O9ac5g6jeFEkXF+JEMdr1HJIBex/3fzoyxsFdU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784127267; c=relaxed/simple; bh=YmoPzivoUVC4z+GD4C9dgp0VaLkJZwU+d/4+hGh3yNk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rCqR01JI7kCLKMrRYByCS+B5PCymmDAMPDSpaw451vSRXeAvdQwT/tQAK62Mct5th3jhFauNV+/Az76W7uedGNZfYdCg1EvjTBpOJJp7aMejx6mvxpanXgZ2C9UQf/CRPIT8Lb2JhwQsIRDsiTfPAH2mhbUt6WG+xnqJQjqYTaY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=baUP3uS8; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="baUP3uS8" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-493e4cccd8dso10994235e9.2 for ; Wed, 15 Jul 2026 07:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1784127263; x=1784732063; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3q/mBxAob+M0XblmpPoJEXspUdOZwJaSDjVW/DAN13M=; b=baUP3uS8aGXTxlhxy4X5mPcBSDrzfiWlr/RIKQBnB5+TPXlkLUuuXKf/hdVUDVar32 G/vLMlRi+1PqkPBbwBgIEBLj6+0dlWasEcUEX66y48hSlx1JwuFfkUwi2OzhLlR0jDSN By2BxrG8iaj6n20MDaH2MBEc3oRz/h4rBE6q4UtIswxJnq2kEDidlx1gz/4L1lCXRieO BuLxcHQkiTbjXdDPyZfv9dCZbwGnhoFrK9HbgvoN+iOV2Ohx7R7jCARYr2gscQBt0Eyz 6jpT2egRbVSb8RnayvX9iO9VaZ6eFXkByZLuFS3UGhvMxpturw1q2mdDgGR1v/AYSd+s YHTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784127263; x=1784732063; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=3q/mBxAob+M0XblmpPoJEXspUdOZwJaSDjVW/DAN13M=; b=fS92ndd3Eq6Ira2ewhpdDqILGXtcQ9FvdITxFS2uoW5bC6ocrpnEO0T6AcT3qy6bqq rmfU3igSbvy6uMjPJ6SX6+QgANnN6Cm1QxrxsSu5SCZ5jbLT0H1JTAkajMgtUzJe2hN3 E7qhYZafpmU2rF1UAFfQEUNmQG4JikDt29NACiyU0D6WKB8xIjow1ZaPR+GMqTHPP/Ht mxC7i27Dms8ycmHIlPDl88BnZ3VnuuN9xc60+I8Pk2Fkj1fk06XSNtRh8ugTkhdmN6fJ Qtk3KHW1RyT6yEFLfJST3dBpsTFV1AEdwiXCPtyQZq90gxRKz+7UdMqJPMNch7/AiiKt 89Cg== X-Forwarded-Encrypted: i=1; AHgh+RpETmAqKkBxKV0oMQLfeork40UefinXUFhiwIQbfqXnqW4SfILX5pNaXwRnp/5sYylmWnzRsmc2JBp5DhM=@vger.kernel.org X-Gm-Message-State: AOJu0YxdmjYnyvWS/lrKVo5VHFVBUCuw6jzIK5Nr/+Q5S21MKxgR1d6h n9pWXO9k9c+L8+U5hI6YkafeRHabEVXCuEaLHnGE9hckw6YSm+Fjb3qcJg2NhSIJYT0= X-Gm-Gg: AfdE7ck7oiBI5iIlm8toLjndmhxepvy41LNHv87INpEd3KacecfMHPHV82UoAcNYNAe uaaZ89qKoXop5EEwesAccruKSb7NBwQIxQDxop3chuZCzWMVYs2nXxcJVesQ7tmHTziK4Tl8npa 3Be5goQ23OzHwuLzsjFS7uEZ0/zrDWLDMM6NoD33r2m43OIbXQyODO003Fr3cPqtOZcB5N+X4Vk qL3lbcq2OTtuSmutkeD5U18dwrXs8HT0V7ac4RJgMxY2g6JD1ItXFwovVR0a8iwrY+PR3Dcvuxb xrLq74pcU1xvhnJPPREhlZqXw1Td6swktKRYyeJmAtmPnAPoFzG/z3r36EyT8XXAOjFdBaTVRVt 1bJ+yF2mPhJ+JEtZWRzmZGX3b98iT1YIBYBRGXRYy6sw5Xx0+S0xHWuxrjCpd3eHnFcrHvacGmW N//i3DHfniJMXuYYCTwlp7EQ== X-Received: by 2002:a05:600c:4f8a:b0:493:e947:b24a with SMTP id 5b1f17b1804b1-493f87e72a8mr183785635e9.14.1784127262701; Wed, 15 Jul 2026 07:54:22 -0700 (PDT) Received: from e133063.arm.com ([212.187.182.162]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49510c8e220sm137649275e9.15.2026.07.15.07.54.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 07:54:22 -0700 (PDT) From: James Clark Date: Wed, 15 Jul 2026 15:53:51 +0100 Subject: [PATCH v4 4/4] tools/build: selftests: Remove some duplicate toolchain definitions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260715-james-perf-llvm-version-v4-4-6dfdf984b435@linaro.org> References: <20260715-james-perf-llvm-version-v4-0-6dfdf984b435@linaro.org> In-Reply-To: <20260715-james-perf-llvm-version-v4-0-6dfdf984b435@linaro.org> To: Arnaldo Carvalho de Melo , Namhyung Kim , Ihor Solodrai Cc: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Ian Rogers , Adrian Hunter , Shuah Khan , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, James Clark X-Mailer: b4 0.14.2 Try to remove some, but not all duplicate toolchain definitions. In these instances, their makefiles already include tools/scripts/Makefile.include which defines these in a consistent way. STRIP is the only one that was set with an '=3D', but I don't think it was significant so that difference can be dropped. Signed-off-by: James Clark Acked-by: Ihor Solodrai Acked-by: Kumar Kartikeya Dwivedi Reviewed-by: Ian Rogers --- tools/bpf/resolve_btfids/Makefile | 3 --- tools/lib/api/Makefile | 4 ---- tools/lib/subcmd/Makefile | 4 ---- tools/lib/symbol/Makefile | 4 ---- tools/perf/Makefile.perf | 6 ------ tools/testing/selftests/bpf/Makefile | 1 - 6 files changed, 22 deletions(-) diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/M= akefile index 7672208f65e4bc245c03603634d3aa0093a91096..6fdb6302e0a28e9166175822f42= cfbb4f4eb24e5 100644 --- a/tools/bpf/resolve_btfids/Makefile +++ b/tools/bpf/resolve_btfids/Makefile @@ -20,9 +20,6 @@ HOST_OVERRIDES :=3D AR=3D"$(HOSTAR)" CC=3D"$(HOSTCC)" LD= =3D"$(HOSTLD)" ARCH=3D"$(HOSTARCH) CROSS_COMPILE=3D"" CLANG_CROSS_FLAGS=3D"" EXTRA_CFLAGS=3D"$(HOSTCFLAGS= )" =20 RM ?=3D rm -HOSTCC ?=3D gcc -HOSTLD ?=3D ld -HOSTAR ?=3D ar HOSTPKG_CONFIG ?=3D pkg-config CROSS_COMPILE =3D =20 diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile index 8665c799e0fa7155016e8bc6968ebe76a90e1d13..a228fdb5adba8d7f8282688964a= 9751a06cb0c79 100644 --- a/tools/lib/api/Makefile +++ b/tools/lib/api/Makefile @@ -9,10 +9,6 @@ srctree :=3D $(patsubst %/,%,$(dir $(srctree))) #$(info Determined 'srctree' to be $(srctree)) endif =20 -CC ?=3D $(CROSS_COMPILE)gcc -AR ?=3D $(CROSS_COMPILE)ar -LD ?=3D $(CROSS_COMPILE)ld - MAKEFLAGS +=3D --no-print-directory =20 INSTALL =3D install diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile index 8703ab487b68c89406fed575217b57f58e71fb01..9f1ddcf0504d993249991e0af45= 89db1072465d1 100644 --- a/tools/lib/subcmd/Makefile +++ b/tools/lib/subcmd/Makefile @@ -9,10 +9,6 @@ srctree :=3D $(patsubst %/,%,$(dir $(srctree))) #$(info Determined 'srctree' to be $(srctree)) endif =20 -CC ?=3D $(CROSS_COMPILE)gcc -LD ?=3D $(CROSS_COMPILE)ld -AR ?=3D $(CROSS_COMPILE)ar - RM =3D rm -f =20 MAKEFLAGS +=3D --no-print-directory diff --git a/tools/lib/symbol/Makefile b/tools/lib/symbol/Makefile index 426b845edfaccf56f7c246c281a549c18d0f3919..d692abe8add6e243d7b024fe556= cc0983eb4b443 100644 --- a/tools/lib/symbol/Makefile +++ b/tools/lib/symbol/Makefile @@ -9,10 +9,6 @@ srctree :=3D $(patsubst %/,%,$(dir $(srctree))) #$(info Determined 'srctree' to be $(srctree)) endif =20 -CC ?=3D $(CROSS_COMPILE)gcc -AR ?=3D $(CROSS_COMPILE)ar -LD ?=3D $(CROSS_COMPILE)ld - MAKEFLAGS +=3D --no-print-directory =20 INSTALL =3D install diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 4d0d7ae02e06b117487a17691c4e62a138428ac5..ca67d4b6fc38367c63123332360= ccf27102fc086 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -174,11 +174,6 @@ endef =20 LD +=3D $(EXTRA_LDFLAGS) =20 -HOSTCC ?=3D gcc -HOSTLD ?=3D ld -HOSTAR ?=3D ar -CLANG ?=3D clang - # Some distros provide the command $(CROSS_COMPILE)pkg-config for # searching packges installed with Multiarch. Use it for cross # compilation if it is existed. @@ -213,7 +208,6 @@ FIND =3D find INSTALL =3D install FLEX ?=3D flex BISON ?=3D bison -STRIP =3D strip AWK =3D awk =20 # include Makefile.config by default and rule out diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests= /bpf/Makefile index b642ee489ea64046a9b19852780c3a6f009cbd82..a1a4ae76365955f8f7c1193a03e= 74bef0d344f9c 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -3,7 +3,6 @@ include ../../../build/Build.include include ../../../scripts/Makefile.arch include ../../../scripts/Makefile.include =20 -CXX ?=3D $(CROSS_COMPILE)g++ OBJCOPY ?=3D $(CROSS_COMPILE)objcopy =20 CURDIR :=3D $(abspath .) --=20 2.34.1