From b7e673b2194eb4bd3fdaf69fec690cfcc61e0533 Mon Sep 17 00:00:00 2001 From: Kyle Lin Date: Fri, 17 Jan 2020 02:04:58 +0800 Subject: [PATCH] arm64: configs: vendor: Switch linker to LLD If we enable lld, we also enable the CONFIG_LTO_CLANG to avoid the build breakage. We need to do two things 1. To enable CONFIG_LTO_CLANG in defconfig 2. Clean the "-d LTO" and "-d LTO_CLANG" from build configs THINLTO also disabled and we enable it when using *.config.no-cfi to reduce the build time. Bug: 140525226 Change-Id: I7adb9f9e474acddad078447be17777355d884d20 Signed-off-by: Kyle Lin --- arch/arm64/configs/vendor/bengal-perf_defconfig | 1 + arch/arm64/configs/vendor/kona-perf_defconfig | 1 + arch/arm64/configs/vendor/lito-perf_defconfig | 1 + build.config.gki_kasan | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/vendor/bengal-perf_defconfig b/arch/arm64/configs/vendor/bengal-perf_defconfig index e6d5a900c9a9..77d2a4795333 100644 --- a/arch/arm64/configs/vendor/bengal-perf_defconfig +++ b/arch/arm64/configs/vendor/bengal-perf_defconfig @@ -91,6 +91,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_JUMP_LABEL=y +CONFIG_LTO_CLANG=y CONFIG_SHADOW_CALL_STACK=y CONFIG_PANIC_ON_REFCOUNT_ERROR=y CONFIG_MODULES=y diff --git a/arch/arm64/configs/vendor/kona-perf_defconfig b/arch/arm64/configs/vendor/kona-perf_defconfig index 82b355ba6cff..2d5b85b27692 100644 --- a/arch/arm64/configs/vendor/kona-perf_defconfig +++ b/arch/arm64/configs/vendor/kona-perf_defconfig @@ -92,6 +92,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_JUMP_LABEL=y +CONFIG_LTO_CLANG=y CONFIG_SHADOW_CALL_STACK=y CONFIG_PANIC_ON_REFCOUNT_ERROR=y CONFIG_MODULES=y diff --git a/arch/arm64/configs/vendor/lito-perf_defconfig b/arch/arm64/configs/vendor/lito-perf_defconfig index f1b9faea3c50..388a51e320d3 100644 --- a/arch/arm64/configs/vendor/lito-perf_defconfig +++ b/arch/arm64/configs/vendor/lito-perf_defconfig @@ -89,6 +89,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_JUMP_LABEL=y +CONFIG_LTO_CLANG=y CONFIG_SHADOW_CALL_STACK=y CONFIG_PANIC_ON_REFCOUNT_ERROR=y CONFIG_MODULES=y diff --git a/build.config.gki_kasan b/build.config.gki_kasan index 5528fabc8797..be34104f2de0 100644 --- a/build.config.gki_kasan +++ b/build.config.gki_kasan @@ -9,8 +9,6 @@ function update_kasan_config() { -d CONFIG_RANDOMIZE_BASE \ -d CONFIG_KASAN_OUTLINE \ --set-val CONFIG_FRAME_WARN 0 \ - -d LTO \ - -d LTO_CLANG \ -d CFI \ -d CFI_PERMISSIVE \ -d CFI_CLANG \