From 2268895ef5c4dae3c4de978804884ed7e63690b0 Mon Sep 17 00:00:00 2001 From: Zhangqing Huang Date: Thu, 17 Jan 2019 02:55:16 -0600 Subject: [PATCH] Revert Enable CFI on debug build This reverts commit 212c97dd8ded53c0029346387ef7001e41b9fc16. Change-Id: I1564e753e0ec16b2fde0d47c7a8fa09d8c98ec67 Reviewed-on: https://gerrit.mot.com/1296049 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- arch/arm64/configs/ext_config/debug-erd9610.config | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/configs/ext_config/debug-erd9610.config b/arch/arm64/configs/ext_config/debug-erd9610.config index 491b64a491e8..64cef242af26 100644 --- a/arch/arm64/configs/ext_config/debug-erd9610.config +++ b/arch/arm64/configs/ext_config/debug-erd9610.config @@ -58,3 +58,10 @@ CONFIG_PAGE_POISONING=y # CONFIG_DEBUG_SNAPSHOT_MINIMIZED_MODE is not set CONFIG_BUG_ON_DATA_CORRUPTION=y +# Disable CFI on debug build +# CONFIG_CFI is not set +# CONFIG_LTO is not set +# CONFIG_CFI_CLANG is not set +# CONFIG_LTO_CLANG is not set +CONFIG_CFI_PERMISSIVE=y +CONFIG_LTO_NONE=y -- 2.20.1