[PATCH] kbuild: Fix Propeller build option
From: Rong Xu
Date: Fri Nov 08 2024 - 00:10:52 EST
The '-fbasic-block-sections=labels' option has been deprecated with
the following llvm patch:
https://github.com/llvm/llvm-project/pull/110039
The old option still works, but with a warning like
clang: warning: argument '-fbasic-block-sections=labels' \
is deprecated, use '-fbasic-block-address-map' instead [-Wdeprecated]
Currently, the option change is only in the ToT clang (v20) and not yet
released in v19.
This patch adds a check to the Makefile to set the proper option.
If the option change is later integrated in v19.x, we need to update the
check accordingly.
Signed-off-by: Rong Xu <xur@xxxxxxxxxx>
Reported-by: Nathan Chancellor <nathan@xxxxxxxxxx>
---
scripts/Makefile.propeller | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/scripts/Makefile.propeller b/scripts/Makefile.propeller
index 344190717e47..1a68ea0d1fe4 100644
--- a/scripts/Makefile.propeller
+++ b/scripts/Makefile.propeller
@@ -5,7 +5,13 @@ 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
+ # Staring with clang v20, the '-fbasic-block-sections=labels' option is
+ # deprecated. Use the recommended '-fbasic-block-address-map' option.
+ 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 +27,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 clang-min-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