Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kbuild: Fix Propeller build option

Browse Source 
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>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Rong Xu 2024-11-08 13:49:53 -08:00 committed by Masahiro Yamada
parent d5dc958361
commit d63b852430
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/Makefile.propeller
View File

@ -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 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 KBUILD_LDFLAGS += --symbol-ordering-file=$(CLANG_PROPELLER_PROFILE_PREFIX)_ld_profile.txt --no-warn-symbol-ordering
else 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 endif
# Propeller requires debug information to embed module names in the profiles. # 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 ifdef CLANG_PROPELLER_PROFILE_PREFIX
KBUILD_LDFLAGS += --lto-basic-block-sections=$(CLANG_PROPELLER_PROFILE_PREFIX)_cc_profile.txt KBUILD_LDFLAGS += --lto-basic-block-sections=$(CLANG_PROPELLER_PROFILE_PREFIX)_cc_profile.txt
else 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
endif endif