From: Nathan Chancellor <nathan@kernel.org>
To: Rong Xu <xur@google.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>,
Nicolas Schier <nicolas@fjasle.eu>, Han Shen <shenhan@google.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Bill Wendling <morbo@google.com>,
Justin Stitt <justinstitt@google.com>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
llvm@lists.linux.dev
Subject: Re: [PATCH v2] kbuild: Fix Propeller build option
Date: Fri, 8 Nov 2024 19:56:47 -0700 [thread overview]
Message-ID: <20241109025647.GA1182230@thelio-3990X> (raw)
In-Reply-To: <20241108214953.1160765-1-xur@google.com>
On Fri, Nov 08, 2024 at 01:49:53PM -0800, Rong Xu wrote:
> The '-fbasic-block-sections=labels' option has been deprecated in tip
> of tree clang (20.0.0) [1]. While the option still works, a warning is
> emitted:
>
> clang: warning: argument '-fbasic-block-sections=labels' is deprecated, use '-fbasic-block-address-map' instead [-Wdeprecated]
>
> Add a version check to set the proper option.
>
> Link: https://github.com/llvm/llvm-project/pull/110039 [1]
>
> Signed-off-by: Rong Xu <xur@google.com>
> Reported-by: Nathan Chancellor <nathan@kernel.org>
> Suggested-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
> ---
> ChangeLog in V2
> Integrated suggestions from Nathan Chancellor.
> (1) improved commit message
> (2) added links to the comments
> (3) used ld.lld version in the version check for lld
> ---
>
> Signed-off-by: Rong Xu <xur@google.com>
> ---
> scripts/Makefile.propeller | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/Makefile.propeller b/scripts/Makefile.propeller
> index 344190717e47..48a660128e25 100644
> --- a/scripts/Makefile.propeller
> +++ b/scripts/Makefile.propeller
> @@ -5,7 +5,14 @@ ifdef CLANG_PROPELLER_PROFILE_PREFIX
> CFLAGS_PROPELLER_CLANG := -fbasic-block-sections=list=$(CLANG_PROPELLER_PROFILE_PREFIX)_cc_profile.txt -ffunction-sections
> KBUILD_LDFLAGS += --symbol-ordering-file=$(CLANG_PROPELLER_PROFILE_PREFIX)_ld_profile.txt --no-warn-symbol-ordering
> else
> - CFLAGS_PROPELLER_CLANG := -fbasic-block-sections=labels
> + # Starting with Clang v20, the '-fbasic-block-sections=labels' option is
> + # deprecated. Use the recommended '-fbasic-block-address-map' option.
> + # Link: https://github.com/llvm/llvm-project/pull/110039
> + ifeq ($(call clang-min-version, 200000),y)
> + CFLAGS_PROPELLER_CLANG := -fbasic-block-address-map
> + else
> + CFLAGS_PROPELLER_CLANG := -fbasic-block-sections=labels
> + endif
> endif
>
> # Propeller requires debug information to embed module names in the profiles.
> @@ -21,7 +28,11 @@ ifdef CONFIG_LTO_CLANG_THIN
> ifdef CLANG_PROPELLER_PROFILE_PREFIX
> KBUILD_LDFLAGS += --lto-basic-block-sections=$(CLANG_PROPELLER_PROFILE_PREFIX)_cc_profile.txt
> else
> - KBUILD_LDFLAGS += --lto-basic-block-sections=labels
> + ifeq ($(call test-ge, $(CONFIG_LLD_VERSION), 200000),y)
> + KBUILD_LDFLAGS += --lto-basic-block-address-map
> + else
> + KBUILD_LDFLAGS += --lto-basic-block-sections=labels
> + endif
> endif
> endif
>
>
> base-commit: 0dcc2d1066150787017a71f035145c566597dec7
> --
> 2.47.0.277.g8800431eea-goog
>
next prev parent reply other threads:[~2024-11-09 2:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-08 21:49 [PATCH v2] kbuild: Fix Propeller build option Rong Xu
2024-11-09 2:56 ` Nathan Chancellor [this message]
2024-11-17 4:52 ` Masahiro Yamada
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 21:46 Rong Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241109025647.GA1182230@thelio-3990X \
--to=nathan@kernel.org \
--cc=justinstitt@google.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=masahiroy@kernel.org \
--cc=morbo@google.com \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
--cc=shenhan@google.com \
--cc=xur@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox