From 2519bc872bbd594f2ec923cb0f90582a3c8d2670 Mon Sep 17 00:00:00 2001
From: Alistair Delva <adelva@google.com>
Date: Fri, 5 Mar 2021 15:07:57 -0800
Subject: [PATCH] ANDROID: GKI: arm64: Enable LTO+CFI

LTO is in thin mode, and CFI is in enforcing (non-permissive) mode.

This change aligns ARM64 to the current x86_64 settings.

Bug: 167259389
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I61323735aa1dd5444212caeb7b8a8b0c7b8d0d95
---
 arch/arm64/configs/gki_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index b435832751a0..6cfff63769a7 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -86,6 +86,8 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_SHADOW_CALL_STACK=y
+CONFIG_LTO_CLANG_THIN=y
+CONFIG_CFI_CLANG=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y