* [PATCH v2] kbuild: Fix Propeller build option
@ 2024-11-08 21:49 Rong Xu
2024-11-09 2:56 ` Nathan Chancellor
2024-11-17 4:52 ` Masahiro Yamada
0 siblings, 2 replies; 4+ messages in thread
From: Rong Xu @ 2024-11-08 21:49 UTC (permalink / raw)
To: Masahiro Yamada, Nathan Chancellor, Nicolas Schier, Rong Xu,
Han Shen, Nick Desaulniers, Bill Wendling, Justin Stitt
Cc: linux-kbuild, linux-kernel, llvm
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>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] kbuild: Fix Propeller build option
2024-11-08 21:49 [PATCH v2] kbuild: Fix Propeller build option Rong Xu
@ 2024-11-09 2:56 ` Nathan Chancellor
2024-11-17 4:52 ` Masahiro Yamada
1 sibling, 0 replies; 4+ messages in thread
From: Nathan Chancellor @ 2024-11-09 2:56 UTC (permalink / raw)
To: Rong Xu
Cc: Masahiro Yamada, Nicolas Schier, Han Shen, Nick Desaulniers,
Bill Wendling, Justin Stitt, linux-kbuild, linux-kernel, llvm
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] kbuild: Fix Propeller build option
2024-11-08 21:49 [PATCH v2] kbuild: Fix Propeller build option Rong Xu
2024-11-09 2:56 ` Nathan Chancellor
@ 2024-11-17 4:52 ` Masahiro Yamada
1 sibling, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2024-11-17 4:52 UTC (permalink / raw)
To: Rong Xu
Cc: Nathan Chancellor, Nicolas Schier, Han Shen, Nick Desaulniers,
Bill Wendling, Justin Stitt, linux-kbuild, linux-kernel, llvm
On Sat, Nov 9, 2024 at 6:50 AM Rong Xu <xur@google.com> 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>
>
> ---
> 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
> ---
Applied to linux-kbuild.
Thanks!
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] kbuild: Fix Propeller build option
@ 2024-11-08 21:46 Rong Xu
0 siblings, 0 replies; 4+ messages in thread
From: Rong Xu @ 2024-11-08 21:46 UTC (permalink / raw)
To: Masahiro Yamada, Nathan Chancellor, Nicolas Schier, Rong Xu,
Han Shen, Nick Desaulniers, Bill Wendling, Justin Stitt
Cc: linux-kbuild, linux-kernel, llvm
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>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-17 4:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-08 21:49 [PATCH v2] kbuild: Fix Propeller build option Rong Xu
2024-11-09 2:56 ` Nathan Chancellor
2024-11-17 4:52 ` Masahiro Yamada
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 21:46 Rong Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox