From mboxrd@z Thu Jan 1 00:00:00 1970 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: 7bit 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 --- 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..e81e5b479c563321e458b2a7ad8fca2b4607a254 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -52,46 +52,46 @@ define allow-override endef ifneq ($(LLVM),) -ifneq ($(filter %/,$(LLVM)),) -LLVM_PREFIX := $(LLVM) -else ifneq ($(filter -%,$(LLVM)),) -LLVM_SUFFIX := $(LLVM) -else ifneq ($(LLVM),1) -$(error Invalid value for LLVM, see Documentation/kbuild/llvm.rst) -endif + ifneq ($(filter %/,$(LLVM)),) + LLVM_PREFIX := $(LLVM) + else ifneq ($(filter -%,$(LLVM)),) + LLVM_SUFFIX := $(LLVM) + else ifneq ($(LLVM),1) + $(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)) + $(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) -$(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 CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?) -- 2.34.1