From mboxrd@z Thu Jan 1 00:00:00 1970 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: 7bit 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=-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=1 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 ?= 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 41971a68972dda218714d6b95b1d9d92349285c3..7022e78208a236604a681d45b1ff4f2128f412e5 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -61,10 +61,18 @@ $(error Invalid value for LLVM, see Documentation/kbuild/llvm.rst) endif $(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 prefix. $(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 := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?) -ifneq ($(LLVM),) -HOSTAR ?= $(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX) -HOSTCC ?= $(LLVM_PREFIX)clang$(LLVM_SUFFIX) -HOSTLD ?= $(LLVM_PREFIX)ld.lld$(LLVM_SUFFIX) -else -HOSTAR ?= ar -HOSTCC ?= gcc -HOSTLD ?= 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 -# Some tools require Clang, LLC and/or LLVM utils -CLANG ?= clang -LLC ?= llc -LLVM_CONFIG ?= llvm-config -LLVM_OBJCOPY ?= llvm-objcopy -LLVM_STRIP ?= llvm-strip +CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?) # Some tools require bpftool SYSTEM_BPFTOOL ?= bpftool -- 2.34.1