From nobody Fri Jun 12 14:18:25 2026 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 433652FE591 for ; Thu, 14 May 2026 09:32:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751155; cv=none; b=guH+q6o6lYSZVkBTm0GvaDFRYRxhIiB/HW+v1EJPYfdZR4Cb6/GxT3SqTY0IaxehJF+6cJLbLdbyuQqPtwprHGoB/OWWKgRlb93jZ/CgX/zg+2jhDGEa+jbFWSx31YNTsi/xazsi7lY90JEAXA/j82tplRgUGMY0/LQHvXJB0sk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751155; c=relaxed/simple; bh=i/0OlfT29DMUOjLxI+zP/lSGgbixizaY1dSO2x2Y5o0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mV8ZGpw6FLiPLd4nU/jcz2/O1NgC/ti665UoXmajwBoVu3eq7M8EZfl/ETreYv+aNUkZpibTOdaHH4j5nCEPaiINzI8ZIQVAjmhjX3I3HQhJ7WsFJEftfrH11jX/ozsa6CZadOU38HstrTQnFqovqeX7cImzuX15kuovig8BTDM= 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=oc7N0XCg; arc=none smtp.client-ip=209.85.221.54 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="oc7N0XCg" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-452169ae568so5955524f8f.3 for ; Thu, 14 May 2026 02:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778751152; x=1779355952; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=YYpkMhrLfOeREVg1A6emQSE4RLjyH6VWZIyJ8FRo8sU=; b=oc7N0XCg782m9kROF0mMVqhvI+mqc+mWHOkCKhYDuMP/h4u5PyK9qxx2prNIN3/cNd ghQ52IXpYduOnFmd9tg1goxIuU/bXtUn7UM6JHippkIbSBFNW888MKrLym4UIJifvqdM b4z2tS3jU6XHX8bq61x+MwMek8tUBWohFXc0vcsk5KF16WQU08lqbQRYcPFZIJVUvpYk sfmSgF+Kx69FAqrsWRGZrAEswJBSKL7qAC+TJ7eXqdFWZI7S5U28FF0mFm3J+fwnhQfs atTBVhsx5Dp/7+iXyDJFRJE/51d9UKVbYRjj+Oh8T+3PDBGTcL2tn003lVE26x6b0Us/ UcqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778751152; x=1779355952; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=YYpkMhrLfOeREVg1A6emQSE4RLjyH6VWZIyJ8FRo8sU=; b=bhGlTuri/UmpJRO6Jy5qTS/37WTsnQ7JZceQGXnFmpUYW5Zd+z5pFBtwJDAF4C6ycV QP7NDzw0vaNY3WaJbyblRTmkgSXbFliO5iK/HvQ8vuJ5e7AMc7X1Ku2sZliModM9SKcU ByuO3gd2S1O4cc9kBi3Qn+l+HVTezDyhSy452hIbXm4g5uIxnOkU+HmablkFqEgZHPHd aP5egSlayeuLFbuamq4CsTjghVU2pFgU7ZqYmNkCkRJ7MAR2RUiTOgDiGKJGEwZbyZVT 5mzZxJEdrmDTXaOucGGiCtoyGIs3A9rkz13QMlyUrZz8xMU8o4To4ShKW6m6XuCdE12b 5YNQ== X-Gm-Message-State: AOJu0YyYfFLQY3/TIt6L9SHs8MV081lv+uWJaWhR7Zcg4wrE0IqSWqxr Jbgu0OKRDMAOtW1qguLkB9yhC7+sAjYKtqJIHIbYoHzqYHMnWSdmSCIZwZYGgwfILnk= X-Gm-Gg: Acq92OHoJzmBbKX9LRnE3MNJiKet8J0elBV8/nCsccVrSwv1khYdcva6HgNO+JKzJq5 IdyeI6U5TscBl811QT5lMPnUM3HJ+zHAu4GDvV/vIII/4yA7yMhku3cIuTVr2HY4nz4/U2b6+ga 0nTZ76RAzFLnq1wCTTH27ZFh1HgJMo5mBEUwubPZISyE7lvWKlzD8mZZPC/6bPnw/S8SXvwVzs+ eMbDa/RyXRsS6xlkzk8NbuJi2w4ynhjIomabhzqGwlTBiEeLIdIP8mMB1f0azMZjFUKomPrHe8Y AbWrtRIRxlMOLDJV4cJBxFM51AZewUOes0lgV0/8ddSey/lnjf4YgsjLAjkzkWV3NuFe5X1Wrco KsI9LHRSEpKNG5GG8RXkNfxjReNzWylyfsG2HZlOivD1F+4zuDdgA1v3Jjo3IcxlFDsRdCf31Bc z2WmLAN5lvbN8HrR1/agr+ISIJYeOrJ7sR X-Received: by 2002:a05:6000:4014:b0:44a:2555:f8a9 with SMTP id ffacd0b85a97d-45c7814a511mr10431648f8f.10.1778751151725; Thu, 14 May 2026 02:32:31 -0700 (PDT) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe0fecsm5097164f8f.26.2026.05.14.02.32.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 02:32:31 -0700 (PDT) From: James Clark Date: Thu, 14 May 2026 10:32:08 +0100 Subject: [PATCH 1/6] 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: <20260514-james-perf-llvm-version-v1-1-6cac1a9a4c8d@linaro.org> References: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> In-Reply-To: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> To: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Jiri Kosina , Benjamin Tissoires , Shuah Khan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song Cc: linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-input@vger.kernel.org, linux-kselftest@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, James Clark , leo.yan@arm.com X-Mailer: b4 0.14.0 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 --- 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 41971a68972d..7022e78208a2 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 Fri Jun 12 14:18:25 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 CFF133A7827 for ; Thu, 14 May 2026 09:32:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751156; cv=none; b=W46GcnySs2DkNdoamyPGopkndPmvCjhK926NVIb0X4bf1DzxBMYWRO54SnPW0R7Cgo6KSm6XtH1zDBjpA/zVGARqa2a9nPxHh00JmwaE3+SSg0KhpiHCWqWr1V58mMuOdoHFNyxErKnXlRUKIw0K+8HmvAwoke79FvV4JxxfR7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751156; c=relaxed/simple; bh=NfaBRDzFvFklhzTH9t4p9EVBdLk/XaHTDMg8o9QY524=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tBXnIvv8IpRfZvq2909vuFVUxpYAVD5U3TUJz7OI2rxnRgRS7Ym/G5k9SMfYKfKJJod+JI7fkEuUaI0NAtfhUx9ErOwJeMTjLeI9/Lauuj/rxuSPt9lYT6/9TJTBOEXMKRgPWce+jZAx0BUvxThWQSXutQwNtWWpjnfbvAnh/7U= 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=ecZBH/hJ; arc=none smtp.client-ip=209.85.128.52 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="ecZBH/hJ" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-48e6db3ff7eso32216035e9.0 for ; Thu, 14 May 2026 02:32:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778751153; x=1779355953; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=o4dQGlI0To3jzdG+Zpi+3N86C8iuvnWf5obCtCx/S5c=; b=ecZBH/hJkgNSVKPCTs3mdmWAxFhb2nm+bIUu81YF2oo+6gCUbI+PODuz3DDXH8LaXN w7zsodEP/LOXMOYpB36om4KlkV3lhWxQRLWdU9GYq1L2BivOYHACtVMCK/Ovpl6fG6Bo JfpJNs0/GJM1n21YxXlRuEyAXkv8Jqt7ST4gicMgFiqaTvPeLf91XO62mzQZ/2UyC7Yv oNdPrkGDm7AARuTJ6/H1dfzYM2Dk30yDLntoEAW4NZQw2WDdhP9wE9zv1+q8BDTSpIsy 2BiqnJQ9h1FDJS+fTFawnyZJ1X2efdqgZbqsAc9OEmz7UcPzIBvJcpb7zLPnvjC7u8Tz mNlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778751153; x=1779355953; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=o4dQGlI0To3jzdG+Zpi+3N86C8iuvnWf5obCtCx/S5c=; b=Q7kTEelH87bxID8z3au8WZKFrC3ucVtLwOyTFmH5M0UoMlMgiSp9Z89trkxBwHJNtd WtUD7RZWxmXTQllinCR4IF7lIWiDf+l7otvQ/+TEFUpUAzR0T1a+70tanx5JXIZvYulw XUqJpkIoMqMl5Ks6jUssh75CHOizHyv/Ohel14ioHXLTYZJcFkaQS4RSTbKUELe3nkfX YsdJJlB5gB1ZRsnM16H9j1XWkTJ7orOa2Tj1/ohbV0HF6lIzk6xGqAyK72K5jhSluSp2 XdIzSdaHmmn6oh1xjMywgVkdhQBXgHG+eimio+FeJfONOl1FqMvkmrKzXZubzQeWSLxH U2cQ== X-Gm-Message-State: AOJu0YzNionCg42N2N63NDzmcrIysBfhQJ7sAT3oxp/Zp5kb7s1ska4I QpGHXHmjU2+bihW1Gl0HnBHtSm5WawSOpHVvyOK+a4WEPcR3N4k6+YeQVCi2fBG2gD8= X-Gm-Gg: Acq92OHhlz/yd/rLsbLlnkxJTWlyQXAw7+9xo92erX2pT+3AiAzz+hLLbuwW6w1EFH+ 8ZOa03Q5w4JWgrdzsrRJk+KOHHOQlvT088T8Gskq3FIyhkPfDu8q1CHi5uggI0ekfIgFvdgBSLT 5s/tEWxJvHOTZgN9OcR6+/bmjsjAqy5p30aYlaiAZOIcso8zPNv/PhGzslOUNVpa0EVq1oirer5 ipsgTQvgZexNXbYVQV4N0YP9ocVDt2EFwUB9IQG3Ypi/Ldan1vjPXCXr8KPYr4oB9AsYu9LXWvX OjcUvkAKkThPn7Q9KE/4bbyNBXKISRRU0eyQ2UzYJeFY4Fcc+0unvzrz3pocGARVq2/UsiNl7ey HgLJDqJj+BAc6JiNVNmw8C4MaeI47x4VmGi9O1fp8HWsft8mDituQkeHyZf1jQLTBmHFKHT98JK AMXxXvzASJV4HirzlIvGQdZvdahVHbSzqL X-Received: by 2002:a05:600c:a15:b0:48e:89f9:9408 with SMTP id 5b1f17b1804b1-48fc9a3864emr95441075e9.20.1778751153371; Thu, 14 May 2026 02:32:33 -0700 (PDT) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe0fecsm5097164f8f.26.2026.05.14.02.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 02:32:32 -0700 (PDT) From: James Clark Date: Thu, 14 May 2026 10:32:09 +0100 Subject: [PATCH 2/6] 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: <20260514-james-perf-llvm-version-v1-2-6cac1a9a4c8d@linaro.org> References: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> In-Reply-To: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> To: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Jiri Kosina , Benjamin Tissoires , Shuah Khan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song Cc: linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-input@vger.kernel.org, linux-kselftest@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, James Clark , leo.yan@arm.com X-Mailer: b4 0.14.0 These blocks are quite big and unreadable without indentation. Indent them. No functional changes intended. Signed-off-by: James Clark --- 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 7022e78208a2..e81e5b479c56 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 Fri Jun 12 14:18:25 2026 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 6BC2E3A6EEB for ; Thu, 14 May 2026 09:32:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751158; cv=none; b=Y6fyQiNiI4OoE48Fi3/d/FURvoIkgFNIGCYWx0cFz/2VouspW6xPd5M998yt2pHTTARDHk9qSepn4Hdi4hCUEc6bcNl4OPxRPbAL7LsclN2s51RUXMbhiMK67bJlMfd9XcjR2T0gebaujbf7FQNRAO9r/AWKn1Ovut6+MjTC4xg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751158; c=relaxed/simple; bh=PhCveEiZIdUmcGwyU5spejpP9AhnWoovrQrg6qXZOwg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ODJIE7YRIvcDYG9tJ+WuHVqhjflM4H89SbJ3xeqQPnMBwVKwxmLcTTk4SedajnXFMUF5yXAxrtD5YQUekCkYJgLEzsNbodN67ZH1xAv3orO/QVytf/jMFslAiBk2g5Vve+74YZXKxYDQ2gdPEFP05kMvssB2mKwy5SOYOFacfwM= 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=SKllLdfo; arc=none smtp.client-ip=209.85.221.41 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="SKllLdfo" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-44e1ebb3122so4124899f8f.2 for ; Thu, 14 May 2026 02:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778751155; x=1779355955; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Qi50aH0ofyIVTmJunsbTWM1jEiSwseuTv8Zx+hC3coU=; b=SKllLdfoN0Y039PhFkLl9oTbjG8i/6bFqAK1ersRlrGseyUNRaCnIy9+QWfDVkY/f9 BWFii5iiQzPYcVx/xkhRJummjt7betIPkydGzr1pVaC3/qIgPHJhb46KsgsMBZEvoN01 kHbwJ/ogyi+E1e7WEdXPZwIKk98z39/WjyqvMfUCQGAQlvZZUYxWC03RNJ5OJvDFzXzn ehYj5rxpQFFL1Ow1mFV24OiAPiT4qe9h9OwK6a2fV00tOSS8ThAywAsaZ9QYCCSg+EoE KonrDqzE4IVe52SzdJCAZ+gG4D5p/7ugJiEOL8eeD662zovMIPy/N8Y+r/RCESH8HgAl IG2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778751155; x=1779355955; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Qi50aH0ofyIVTmJunsbTWM1jEiSwseuTv8Zx+hC3coU=; b=C4BnEb5cKlA6ipUF3MoS90PVvAGMG622FaoGMK8KTtJYPm3ky72asQTNqmyVo1V5/H 6AfnaymUe/9adeYH5Nw9IN6OpPep/W8PIw7cLHueMRvqICm2ZaLGEQ0+FsdEnZ198qpS s/g0QuCO5Fisz0qMbS3/pTF31EtvBxnG2AiJlI+t94nTw0DRi1IC/T82YukEYQXyFbCN ofPJr3lhXNpfvJVYXg4LdU5hxBvXixoenXspLlC85vqAAq3oY3vVqUmk4HeMNfpIEFz+ Uox9tTNrEFCD21H2ZpJCWtJjrAmS4fzlOrwNebaionCPDFC61WPIozL4Rpvu/4ai01wz Nb2w== X-Gm-Message-State: AOJu0YxB9e0oVQjEfz4r2sqWtcU7RYfnJqJMk8paYbn17IeDw+T7KFIB J2cRM59KFODOJY6sQMX8dMipgCh+KVYB/oI5Ifc38nCSnRLcOnLpSrjNXDCi42K81kk= X-Gm-Gg: Acq92OGqsVEpq7lBV+H6FDrD+O07CE/PgiSh8rSCheHbO5qqEqsZT3BuC8u+nQ+mgr8 5rjDiXaHBJXTRh8JeRWO4Iv8KnYYuwXQOBBy1Zqa6Wctu1+NfZ0Jaq1dXwRyVY+vbZp5Hz2rwtv fE/lHJEXDpf1r/kcysBBSaODO9XZWZqrr5pGyCzXEpUDPP3l5IH+Gp6KjEeJy3G6kOv447heemA YT4ptuhQDOIcrzegsr6ORQ7ikpgpQoDRw6W1b6KBvHqIzoRQuGAYWRshqg2tEGUojHIG1588QcY Zha6Vyhw71/phgO/zwigCuStyv6C4anKhlB0AUKmHcl4SBM/OtpczC/8KGFn7rDDQ+C15fN2UoZ PccIp9XggI8GJnWoWr10O7n6BHbf6azDKA/wJcxhBt3f0W/17iOWFGx6TTahbTnf5L4pOwVU/z8 i0/HEOwNfDQkBX2p+uhi9pN0xqW2TxvRnS X-Received: by 2002:a05:6000:2882:b0:43f:ea91:63ff with SMTP id ffacd0b85a97d-45c58a70c1emr11251761f8f.10.1778751154951; Thu, 14 May 2026 02:32:34 -0700 (PDT) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe0fecsm5097164f8f.26.2026.05.14.02.32.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 02:32:34 -0700 (PDT) From: James Clark Date: Thu, 14 May 2026 10:32:10 +0100 Subject: [PATCH 3/6] selftests: Remove unused LLD variable 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: <20260514-james-perf-llvm-version-v1-3-6cac1a9a4c8d@linaro.org> References: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> In-Reply-To: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> To: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Jiri Kosina , Benjamin Tissoires , Shuah Khan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song Cc: linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-input@vger.kernel.org, linux-kselftest@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, James Clark , leo.yan@arm.com X-Mailer: b4 0.14.0 This file was mostly copied from selftests/bpf/Makefile, but the LLD variable is not used here. Also, this copied block didn't get the same fixes as the original one did later. Remove it to avoid confusion and so future fixes don't have to be in two places. Signed-off-by: James Clark --- tools/testing/selftests/hid/Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/testing/selftests/hid/Makefile b/tools/testing/selftests= /hid/Makefile index 50ec9e0406ab..96071b4800e8 100644 --- a/tools/testing/selftests/hid/Makefile +++ b/tools/testing/selftests/hid/Makefile @@ -105,13 +105,6 @@ $(MAKE_DIRS): $(call msg,MKDIR,,$@) $(Q)mkdir -p $@ =20 -# LLVM's ld.lld doesn't support all the architectures, so use it only on x= 86 -ifeq ($(SRCARCH),x86) -LLD :=3D lld -else -LLD :=3D ld -endif - DEFAULT_BPFTOOL :=3D $(HOST_SCRATCH_DIR)/sbin/bpftool =20 TEST_GEN_PROGS_EXTENDED +=3D $(DEFAULT_BPFTOOL) --=20 2.34.1 From nobody Fri Jun 12 14:18:25 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 0E49D3AB26D for ; Thu, 14 May 2026 09:32:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751163; cv=none; b=PKerpwS/P52pKIAU7SFuWxl7cBfeqOJ3Yi7lOycF3qGbDtlefCWhIUrG7tdnkewvpJgVLM9NZAY11yJ/q4lbn6X93EMJLYq7AaLEAB/ffM18k82G8dZwA5xpAWkoIYpRkfJWlwQnjd/Wc3wnXkxP5+wKRxetoDnW0P52BqliEE4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751163; c=relaxed/simple; bh=XYN2OerTukpjvC5uTpCQ4LBfsGgqw8htnZqoFgokKo0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=d7dUc1wiSyOmEVSwPWy/Jz60jzcwAmx15cT0q9CqulGDDUZ+xV3SaFn69pkDeh1HfNji0APL2Xz4RiiR/4X0lmWIOF2qsXCuqo2PRoilxvPGNIkQ+KwmQDbLNfWatLyudVTl65jVadJZ0DqrlS8RoYmSq4bF1QnML6e5FiBxpHA= 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=qndKZp7l; arc=none smtp.client-ip=209.85.221.42 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="qndKZp7l" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-44e1ebb3122so4124930f8f.2 for ; Thu, 14 May 2026 02:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778751156; x=1779355956; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=BuYOAkPGvNGtocwKIFKK4r5RpQsaxB3pkCmwnF/UVxs=; b=qndKZp7lDorCBa7sajI+CZYDZB1NuRkdNQ0d+iHDv/tiKuipVL58gdzg5bMk33ic+l Xy4tob6aYuK0gybNkNeUXOnGE8I7Oy+Kysn0zjXrE3I2mvuBpjY2lSAskTCLhKM9y/Ig V2CD2E6pcxCupf11HnAD3fOHsQMU4wAyOy8uoW6xHrS4tawDS1hEy2J9jBdjq7p+Y7dd /MsEtG0XzBdvMkr9duleLozwIPnvWLEVNYLW68gmbap4Ug/HfzbzWknouqgPe1gn/5ny 0HI7Wop5qjEwxNV8rO2NLSKSwQJTKWq8l8xnjCVeq3Zp+Tbrin/msiGZUXR6vslAXkfd pxmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778751156; x=1779355956; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=BuYOAkPGvNGtocwKIFKK4r5RpQsaxB3pkCmwnF/UVxs=; b=aFmhft8an6lSvWubtU9gApCl67m+q7hWTjVgeRO03lwgbcvJm/+6dye6I3HuF5L+53 CM7WeFp5cnmK0/IZ/HjwHU2FzAjlPfjsRf3D1RdpYKzxLjeMjKI7w1DgLpLjAiP9D3tB 7M0zRFLGdO4VWPDNzxyWRtRUok8RI7oNWCnaPqu4iVKwYxi5kmlZgtBbbJ1xV+EH3ZZd 2WFXQFQrFKNVprfTy3Q021n12AYGyDghOIKF9MfGdOzksO6WzvpVZXa+WaQQyd3igdej OhKMgixEVGaH8OlcA8zMhHMPMB9B3d0iku3uZ+gAXIakerlPWo3lvCUcuJrZS5WPbENi pMTA== X-Gm-Message-State: AOJu0YwKAONwz1HcT1FnFJHkxVt+kPMpZx4I+lo43WhoIxfHLtUONcEg h65O9J6eB6+0CZD7usGLPt3xjn5aFU4afx5fvK4SIlPGGt888PfMaYiUcF4XvDWnpCo= X-Gm-Gg: Acq92OHOr+xBL3YKOwAsRks0qCLSuI6U85GbZwqXXU3zv9GnXq0zrBJImCVY2Ie5pdj 6l5N5vDLHfuBok81knJcmV2VtNWLuyXIb/QUCxtHZNNbn9kBCmJ7NEWM/Dwu2OSqYS+61R2gL4C QOhlysL7/+LascX8HEvhzuAy8gXk64dgx+9dm9X76A74pMesk5TQJXALrqhoevmwqb2BG3RdBAW fkpMdRG1QemJGwTVRFgUx0znLOtqdBxSeTUtXomL4kIBH/4RtioxNbMXrg6GYXOCdORtHCZt3X/ X7tpDEzGptHZh37Np4EIpZIIMnmao00QhW+PjF4uu/sTTrIccT5qNEcY2BU/t9cksMQ+JcIr2I3 91PQTXp0HzS9B+BGpEjQPwI8G9JUtZG5Qzy6lotGDO9zjETYL9sSyYbYDI8ZQnF0UCWKhV8EOPp w4+Br3G3lz2HMAaczX+Y82BXjQYOBUV9dO45F7Ujdo+yg= X-Received: by 2002:a05:6000:2910:b0:452:2834:c690 with SMTP id ffacd0b85a97d-45c554747bbmr10469740f8f.0.1778751156557; Thu, 14 May 2026 02:32:36 -0700 (PDT) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe0fecsm5097164f8f.26.2026.05.14.02.32.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 02:32:36 -0700 (PDT) From: James Clark Date: Thu, 14 May 2026 10:32:11 +0100 Subject: [PATCH 4/6] 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: <20260514-james-perf-llvm-version-v1-4-6cac1a9a4c8d@linaro.org> References: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> In-Reply-To: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> To: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Jiri Kosina , Benjamin Tissoires , Shuah Khan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song Cc: linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-input@vger.kernel.org, linux-kselftest@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, James Clark , leo.yan@arm.com X-Mailer: b4 0.14.0 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 variable. It also didn't have the cross compile prefix, so either readelf didn't mind opening cross binaries, or it wasn't working for cross builds. Signed-off-by: James Clark --- tools/lib/bpf/Makefile | 8 ++++---- tools/perf/Makefile.perf | 1 - tools/scripts/Makefile.include | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 168140f8e646..180dca9c57c8 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -114,12 +114,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 $(READELF) -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 $(READELF) --dyn-syms --wide $(OUTPUT)libb= pf.so | \ sed 's/\[.*\]//' | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}' | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) @@ -182,12 +182,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) | \ + $(READELF) -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 | \ + $(READELF) --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 0aba14f22a06..63276bf55856 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 e81e5b479c56..380ad84ac51e 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -73,6 +73,7 @@ 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)) else # Allow setting various cross-compile vars or setting CROSS_COMPILE as a= prefix. $(call allow-override,CC,$(CROSS_COMPILE)gcc) @@ -80,6 +81,7 @@ 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) --=20 2.34.1 From nobody Fri Jun 12 14:18:25 2026 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 C2ED93D6CB4 for ; Thu, 14 May 2026 09:32:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751163; cv=none; b=gXHeGT4H78/4W87Wydm6p/qh+gkh2aVI8MW/DaIJUyRCBLQp5uUhRPyiHbOgf2AD2xdXd8hc3BDxG6/6Y5JPrwVz3W1sxXxxr+GN2jMGj5M+5YU5brQKbraBF/0Yq3UT4YX/LJuf4fFbalfzQjt8s6v3KJQkxm149gkOfIxsonk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751163; c=relaxed/simple; bh=rZB6cVP+OB68GQ9mGdUKO+TcRKpuZdabKai7x8UMJI4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jgQ7kumh+yL7d2jbODd2MZSV8Kqs3M7rX8lg2fT1OlfQr9eGU+5FmrWh+hGkQB8ZGCreg4kvBHu1nOpFwPhCHYVVejWfqVQcrLYFqzr8lcKVh7AHLWuthsSGT2LO4zH4RpSW0cRBqKpk7WSlliwKHDsgc9UBWEC3/HqN3LHuWUs= 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=K06+my5v; arc=none smtp.client-ip=209.85.221.46 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="K06+my5v" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-43d77f6092eso4861186f8f.2 for ; Thu, 14 May 2026 02:32:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778751158; x=1779355958; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=0xKmC3f9l+RG3PTmyEhaHWpzz2ePbx7CweTWHocme8c=; b=K06+my5vcQEgaWNs9UVMQZyL3U0bos8Nvf/4lGC1tCTXoBNqCpqS6SGUgIZC0Gbwau k0a5YhpXoOIFDn05fRAk4eOpz4FS6+iup+DN3mz4BTVNsDBtztfWf4VLG24lbcVdVLLM 0Fap84qn5CLkZ6sEFDn7Iq1WwlACp9AOHsL5uhCEv/jU7Fy1xCxdkgGA9MGh2Dmze2dj ShifqMdb6dfUt9MBkTBEsX8EEEMgbBH46RN2dx8JTygxVpepSQN0CXiB7F0lvAfaPu67 2jYrtg2j+xOOacr0PFzwkD/GkKTT8mEwjTlcnMdMgrEayLzyzo0t+QlENFrJrdhGBKNb 1dIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778751158; x=1779355958; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=0xKmC3f9l+RG3PTmyEhaHWpzz2ePbx7CweTWHocme8c=; b=QGYaGc1On4ryCkR1GLNDgf30J54P1cnOE13Y5pZe1yobNoc/GUiAzBO56ktOme0kMi cmAvkfPnA63DRbyfSaBTXLultJJ9NLK4b2F5RbXZEXrWqQWGHSP3VSFcnbQ+M5hqQNbK 3Oni5dLVX7Hl/pmRXeKNjy/Ln1jknpY7e6SXmIt50z5A4BDSpifSbhDWSkkqniE4MGa0 NLD97oHJX7AZW4Sp9C874FzRH5use5UWJjS31LBGUvuOcI405qZ7BroV8eBt3IM93ODZ 9sRfyK8jHWbgeIHscNnOuJE3ZOJVDcxzR/l4Ec1EypU8RsQr7Klc2xvDbD1JUAnvCjuz 0GZQ== X-Gm-Message-State: AOJu0YxLtnQp9W27pAwKOHHL4D1QLvbhXqvCmeJjL1RImQ5X/wxGtBIJ paqCi5qEyql/cX7v+IbZnzlw7ZkPNuDgzIKkeE3NaWeTYpbZVnf9vx0b8SbPiRbcoaQ= X-Gm-Gg: Acq92OG96A4GdpUof7KJ24lnLMSEHA7SKFmiVjXCEXtmJq0GnBtDsGAVYAJw7ViU20s i4KIyCmeX9WXBsT72wTGgqdVOF5xQ3GdG86Q/WGN/DUJMcnIi5aKPaQlAI05EzjmCdPtsGWBZfj hsfSEjfdqVzgtYrQkqtYasB1q5MVqu/EnOmy0rF6nwJ2eF1vEQpi2yAkQ0jfxd74n+FGo0iYoIE aWw9sSr2bjiPsBgjZuZMxtbQsY3zukcGdfiZYP6aqZviGvdvPVskQJAsj0yJHhsR1gNDaWhiP1H e9B3EM5cLURvFKYmYEXsYLmKBUFP2lDZm6Rq5xgg7NF3947jzjUzqyvyDfaZReuaroo2RYwqjdA HvfW+97ZYg2VzocM0VA0cVAS1BUFlOnHfMT5WPmLeOEulqRdGO2V7aFg7Xa7fpw7E/hA6ODE8HM 6+3Xjm14CjHRsjjo4xe5W/+HFXg4MOSZyR X-Received: by 2002:a05:6000:40da:b0:450:e33b:23de with SMTP id ffacd0b85a97d-45c57dea159mr11278250f8f.2.1778751158215; Thu, 14 May 2026 02:32:38 -0700 (PDT) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe0fecsm5097164f8f.26.2026.05.14.02.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 02:32:37 -0700 (PDT) From: James Clark Date: Thu, 14 May 2026 10:32:12 +0100 Subject: [PATCH 5/6] tools/build: selftests: Allow versioning LLVM lld 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: <20260514-james-perf-llvm-version-v1-5-6cac1a9a4c8d@linaro.org> References: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> In-Reply-To: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> To: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Jiri Kosina , Benjamin Tissoires , Shuah Khan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song Cc: linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-input@vger.kernel.org, linux-kselftest@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, James Clark , leo.yan@arm.com X-Mailer: b4 0.14.0 Building with LLVM=3D... could result in a different version of lld being used than the main toolchain for liburandom_read.so because it's hardcoded to "lld" in this makefile. Make it consistent with the rest of the LLVM toolchain by adding an LLD variable to Makefile.include. Keep the fallback for other architectures in tools/testing/selftests/bpf/Makefile as it seems like it's something specific to this make rule and shouldn't be global. Clang accepts either a full path or "ld.lld-15" style inputs to -fuse-ld=3D so this will work with LLD defined the same way as the other LLVM tools. However, for full paths, we need to use ".../ld.lld" instead of the generic driver "lld", but I don't think the original use of "lld" was significant as this is always a linux build. Signed-off-by: James Clark --- tools/scripts/Makefile.include | 2 ++ tools/testing/selftests/bpf/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 380ad84ac51e..5c2d505cba62 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -67,6 +67,7 @@ ifneq ($(LLVM),) $(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,LLD,$(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)) @@ -91,6 +92,7 @@ else # Some tools still require Clang, LLC and/or LLVM utils $(call allow-override,CLANG,clang) $(call allow-override,LLC,llc) + $(call allow-override,LLD,ld.lld) $(call allow-override,LLVM_CONFIG,llvm-config) $(call allow-override,LLVM_OBJCOPY,llvm-objcopy) $(call allow-override,LLVM_STRIP,llvm-strip) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests= /bpf/Makefile index 6ef6872adbc3..44ba829e5d4d 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -245,9 +245,9 @@ $(OUTPUT)/%:%.c =20 # LLVM's ld.lld doesn't support all the architectures, so use it only on x= 86 ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 riscv)) -LLD :=3D lld +USE_LD :=3D $(LLD) else -LLD :=3D $(shell command -v $(LD)) +USE_LD :=3D $(shell command -v $(LD)) endif =20 # Filter out -static for liburandom_read.so and its dependent targets so t= hat static builds @@ -258,7 +258,7 @@ $(OUTPUT)/liburandom_read.so: urandom_read_lib1.c urand= om_read_lib2.c liburandom $(filter-out -static,$(CFLAGS) $(LDFLAGS)) \ $(filter %.c,$^) $(filter-out -static,$(LDLIBS)) \ -Wno-unused-command-line-argument \ - -fuse-ld=3D$(LLD) -Wl,-znoseparate-code -Wl,--build-id=3Dsha1 \ + -fuse-ld=3D$(USE_LD) -Wl,-znoseparate-code -Wl,--build-id=3Dsha1 \ -Wl,--version-script=3Dliburandom_read.map \ -fPIC -shared -o $@ =20 @@ -268,7 +268,7 @@ $(OUTPUT)/urandom_read: urandom_read.c urandom_read_aux= .c $(OUTPUT)/liburandom_r $(filter-out -static,$(CFLAGS) $(LDFLAGS)) $(filter %.c,$^) \ -Wno-unused-command-line-argument \ -lurandom_read $(filter-out -static,$(LDLIBS)) -L$(OUTPUT) \ - -fuse-ld=3D$(LLD) -Wl,-znoseparate-code -Wl,--build-id=3Dsha1 \ + -fuse-ld=3D$(USE_LD) -Wl,-znoseparate-code -Wl,--build-id=3Dsha1 \ -Wl,-rpath=3D. -o $@ =20 $(OUTPUT)/sign-file: ../../../../scripts/sign-file.c --=20 2.34.1 From nobody Fri Jun 12 14:18:25 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 684B63D9DA4 for ; Thu, 14 May 2026 09:32:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751166; cv=none; b=pOFisemznQBiQKYDn7qs92iRs22Te19/jHOEuS2DLp9PD5RTXPU5ldUXDVXy6huMFXWsYA5u9TUNDeDmADeUWUsvjCUfP7szBkfbt1plCSf+4AI3t5AKB4Jjd/vXPONhIWTVnTgUZ5oE4ps/gXDZVyRiTERQOmF8L4iCySj4Ykk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751166; c=relaxed/simple; bh=EcRWbLjvj5+HxttCv4wwDg08ziIUS2xvxPGRsCPtXfU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VXD762Vc77e3pU8/pkiTMSAWfJSR8sFWROiYc5amPmk8uvuyJOpt+IF7dz+YG+WInAP6iFXxrtFTZA+ZrBTR2CrCGJfJVZ/lWQ4v7EAZmYEQInwiC2smPnms3IXFPmGJBPiCa5TX/EQUeYFYT75XDJ8/Yc+40xiib5vMfqjOn5M= 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=XbwokJ6m; arc=none smtp.client-ip=209.85.221.53 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="XbwokJ6m" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-4526a8170ceso4358273f8f.2 for ; Thu, 14 May 2026 02:32:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778751160; x=1779355960; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=cp0hCjl/7HokOMvEpLytgICfRvv5ETaSkkbSuZLPs6Q=; b=XbwokJ6mDKM0dLWaxQyoAm45W8OyBbuxeuvCIB9b5puAuGnl4ieA8qaIIrawOpJEDv MZNQc6iOR3/9+YaJayb2N775MKOFyTEjPi7lRbzJZUVrwD4vDDqzei0m3xr7RAUAUYnv 7amCUXVN1Ufid9gjSeT8g29T4ApnCJOa2AD/mAi80BJu3KuRkaqTAjXX8U69KEqVVBOo nat01AxBazI5vxJf+hx+ERgBoZybhiErApxdwl3SeNh6ExzCOw73m1/oOhMTEpUOFIpM D9/h8BCpg8VSWtWPxtvaG6Y+mu4qB1l6Sn1oXyC4nXUTY0bG0iX2VrsovxWW19WXY8Wf 2oRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778751160; x=1779355960; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=cp0hCjl/7HokOMvEpLytgICfRvv5ETaSkkbSuZLPs6Q=; b=jYhQ5xYR0+NHk8Jvhzl+s4qo5OZsWsDvqPd4Tae5Fiz3DpYupTTyhJWBBPj9IV5Z18 aDfNmFVYbS3YBpNCSGhUMiiQOFX28njUSYq7P4T1y+Yp3OID6Ml0XJv24QVflgmcaTkD bYD2BOxylz2x+bDOxjQ8Us5gibEgukWJq3rARkT/Cb92Kz34d8zcrxuOf/PP+fuYV2a8 C/g9m3PvW1lLoD+VKU6fZlQWnp7LAyeNxBr3zOq+wVKxSIyvUq2BVaskM8UFedFD9y7t X1HBFcVnYlclbekHGPod77wjHttuHGzLT2ZMOTH39jtNCig7YE8hQcML8CQOX6m88DPy nSNw== X-Gm-Message-State: AOJu0Yye3K7PSelBNR/iJtxOzms4YfUQP0GavYG3d1QMmBgdTzvzQShq 9EUhzaKqxQYx2kdVhX+50CWBbCdYuKUOKIULg2h+zIJJkF1uNwZFCjv+cCTV7RDUECE= X-Gm-Gg: Acq92OGYn/5DFLzLFQYR8uyyHLe6ope2ee4L+ZJZStVONe0sJx3yCzINx04BGfLN5Sx rhXs3SmOUkUsSd6tFix/K7+ucDgg92sYjJhzNq3f0NK3ny2k0xQ0NhhuxD5VTAjfk6KSA5fdDGt RP0JVjm1MAhK5iwHkkPO4U5gbwGP2UyDoHuxKFy2HXbDB81f5ZYbIPKJFNRSSEwFYy70kokgkV+ yDfXh3lCYL/vgLQPcir8Z5+w2jycHwI3EznQoXquNptpdXgiiknisgSLyLv+3qFzzjbwx5Q136L JImJPiuXJqHIKG5kni/r5W+Kz3zkUsODPzaEgSzJYl3vt4PeR1hFKiYFdRdGO1CCd307b+SO4UT 2kv8ElV7JDKXDj0+XVt17ZKqt6s7ln6HsJl3ux5jzQObCmtVV811JWV63B+gMGTEs+zWPbSecNn giwQNBsUYj9EBHBjeU+oQWSpoMmezMqzd5r0EqZEgby+M= X-Received: by 2002:a05:6000:1863:b0:43c:ffb1:2214 with SMTP id ffacd0b85a97d-45c57b050f5mr11407660f8f.16.1778751159863; Thu, 14 May 2026 02:32:39 -0700 (PDT) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da0fe0fecsm5097164f8f.26.2026.05.14.02.32.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 02:32:39 -0700 (PDT) From: James Clark Date: Thu, 14 May 2026 10:32:13 +0100 Subject: [PATCH 6/6] 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: <20260514-james-perf-llvm-version-v1-6-6cac1a9a4c8d@linaro.org> References: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> In-Reply-To: <20260514-james-perf-llvm-version-v1-0-6cac1a9a4c8d@linaro.org> To: Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Jiri Kosina , Benjamin Tissoires , Shuah Khan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song Cc: linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-input@vger.kernel.org, linux-kselftest@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, James Clark , leo.yan@arm.com X-Mailer: b4 0.14.0 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 --- 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 7672208f65e4..6fdb6302e0a2 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 8665c799e0fa..a228fdb5adba 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 8703ab487b68..9f1ddcf0504d 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 426b845edfac..d692abe8add6 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 63276bf55856..948abfd2ee8d 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 44ba829e5d4d..b3e356c34479 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