From patchwork Sat Nov 26 22:56:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 26297 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4856331wrr; Sat, 26 Nov 2022 15:01:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf4iKsbRoGbA6kSC5Warf+euSC7Kp9btNO4ptb7Kc8KR55FGdtLJBS8PjGycjQAM5q1cLkhv X-Received: by 2002:a17:906:52d3:b0:7bb:4d2c:2192 with SMTP id w19-20020a17090652d300b007bb4d2c2192mr11826023ejn.416.1669503711268; Sat, 26 Nov 2022 15:01:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669503711; cv=none; d=google.com; s=arc-20160816; b=GwLP/li4EHxTGtkjxR86mQr+E6KoLYPXLiCDUWOnAkqsO4Zdh0gg2yGBYUtd8Urju4 /7j7otGl+gRpX6zcP6oZplv6q2wzyjADQAxrET9+5XYgEh9ilXBumqJaPYAU2B3dA6s+ md/oWWWWcKfe6wJUeYNSrnAcbbr3C0BrxDSPeGXqt4AUB5aQU/sAIIgmZ3xNRUtOWQvO D3DT3shCZRhopP06npggMZ8k9sXL7E85ciiSCABn3hWpAlV7QI1Ppn6y3yy4eTN+Ztdd yfKMmSDFNeXu62v63Y5IkHDyn2TdJFGUK8ZSW2fu+iMh5UZ4zBYSR088B19/hoOaUnOZ 5dyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=v9Zz8mnM0RdnPQu6mhnUJBcTX3OuFi7b2Wf1xBtFSuM=; b=oqyxeSNArpnORlTOk0WyDSsQIdm7NjHVTrCAMtRKRuATdU/m5MXBLwS/+p3ogxOfNk hBvX31xdk7gwW6VASJkXcjetppas6eSv+KCikQBIYL0uzWN+4NY/U7iUyqcYiec3crTt wRnZUo9UAiuoguuTgksaHcQ3UL03jEFZjlEwWbQA9YrTSQIr1VYJIztkvcduD3N1aRBc cH3X+vN7gQCTje90Klvu3sHH6ZTkpKu8Y2r2KnWwf2rs1zOkavKjHGvTrVG2GFCINc0t aC0e4dDFTPeLoll15LX05KYlb4Z3ri/oKZs/DZ5iq28ftK6PRR6ipFM/Uht7/kvad8Yq GHWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QKdqSqqz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g20-20020a1709065d1400b007b5ce4a4360si7136064ejt.151.2022.11.26.15.01.25; Sat, 26 Nov 2022 15:01:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QKdqSqqz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229652AbiKZW4i (ORCPT + 99 others); Sat, 26 Nov 2022 17:56:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229612AbiKZW4h (ORCPT ); Sat, 26 Nov 2022 17:56:37 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DE08140D7; Sat, 26 Nov 2022 14:56:36 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3A1DF60C71; Sat, 26 Nov 2022 22:56:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FE6EC4347C; Sat, 26 Nov 2022 22:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669503395; bh=573wZuVHPDdtLI75KSLGQVso6x98GKpafL/MbOBnj84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QKdqSqqzEeIs2ufMLbTAh2iA7e74VQUHVXj3lZnEJWwTnbXbMQmBJMDwjy6Pi47Yi /rSP9IjrAT4wZRHuaiJMjiK+fA+Ut98b1CIotwdwXJzAsPYIlVL+ByFAWyikTC0KjF 9tEhumT/zYP54EN5Rf6fo2s6Mlk2NaYI75VUuhekMDmUWipvYqZeD3KsS2OGrRDgys +ouivD+Q6bcYcLg/PIEGOlXI8AvzaDUxCZIX+ovO4Sm6F7fYawzk5JL+TBVXfQbS3r nyW/BAL5VeuvxBbI2jX7xAoyYw4vu8UWC8XbJpV2R2JDnjC2rbo7TN87DgrKqGCEFY Ccv6854i8MvPA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nicolas Schier , Nathan Chancellor , Nick Desaulniers , Tom Rix , llvm@lists.linux.dev Subject: [PATCH v3 2/5] kbuild: implement {gcc,clang}-min-version only with built-in functions Date: Sun, 27 Nov 2022 07:56:21 +0900 Message-Id: <20221126225624.751661-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221126225624.751661-1-masahiroy@kernel.org> References: <20221126225624.751661-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750601523814000764?= X-GMAIL-MSGID: =?utf-8?q?1750601523814000764?= Converting clang-min-version is straightforward because the versions are always 6-digit. gcc-min-version is somewhat tricky because the minimal GCC version is GCC 5.1; prepend '0' to the version that is less than 10 so that test-ge is always passed with 6-digit versions. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- Changes in v3: - Add comments Changes in v2: - Covert gcc-min-version in a different way scripts/Makefile.compiler | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.compiler b/scripts/Makefile.compiler index 20d353dcabfb..4c095beda093 100644 --- a/scripts/Makefile.compiler +++ b/scripts/Makefile.compiler @@ -63,11 +63,16 @@ cc-disable-warning = $(call try-run,\ # gcc-min-version # Usage: cflags-$(call gcc-min-version, 70100) += -foo -gcc-min-version = $(shell [ $(CONFIG_GCC_VERSION)0 -ge $(1)0 ] && echo y) + +# Preprend 0 to the version that is less than 10 so test-ge works. +# This will break when GCC 20 is released. Remove this workaround until then. +gcc-min-version = $(call test-ge, \ + $(or $(filter 1%, $(CONFIG_GCC_VERSION)), 0$(CONFIG_GCC_VERSION)), \ + $(or $(filter 1%, $1), 0$(strip $1))) # clang-min-version # Usage: cflags-$(call clang-min-version, 110000) += -foo -clang-min-version = $(shell [ $(CONFIG_CLANG_VERSION)0 -ge $(1)0 ] && echo y) +clang-min-version = $(call test-ge, $(CONFIG_CLANG_VERSION), $1) # ld-option # Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y)