[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20241109025647.GA1182230@thelio-3990X>
Date: Fri, 8 Nov 2024 19:56:47 -0700
From: Nathan Chancellor <nathan@...nel.org>
To: Rong Xu <xur@...gle.com>
Cc: Masahiro Yamada <masahiroy@...nel.org>,
Nicolas Schier <nicolas@...sle.eu>, Han Shen <shenhan@...gle.com>,
Nick Desaulniers <ndesaulniers@...gle.com>,
Bill Wendling <morbo@...gle.com>,
Justin Stitt <justinstitt@...gle.com>, linux-kbuild@...r.kernel.org,
linux-kernel@...r.kernel.org, llvm@...ts.linux.dev
Subject: Re: [PATCH v2] kbuild: Fix Propeller build option
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@...gle.com>
> Reported-by: Nathan Chancellor <nathan@...nel.org>
> Suggested-by: Nathan Chancellor <nathan@...nel.org>
Reviewed-by: Nathan Chancellor <nathan@...nel.org>
Tested-by: Nathan Chancellor <nathan@...nel.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@...gle.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
>
Powered by blists - more mailing lists