From 970986793d7bc1002ddb1f313074801beb562c93 Mon Sep 17 00:00:00 2001 From: Alistair Strachan Date: Mon, 20 May 2019 16:11:46 -0700 Subject: [PATCH] ANDROID: Enable LTO and CFI Bug: 120439617 Bug: 133186739 Change-Id: I1604ccb18c244610cb95306c1b3874b06dce9995 Signed-off-by: Alistair Strachan --- arch/arm64/configs/cuttlefish_defconfig | 2 ++ arch/x86/configs/x86_64_cuttlefish_defconfig | 2 ++ build.config.cuttlefish.aarch64 | 2 ++ build.config.cuttlefish.x86_64 | 2 ++ 4 files changed, 8 insertions(+) diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index e91ac9279b1f..d383aecda611 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -72,6 +72,8 @@ CONFIG_ARM_SCPI_PROTOCOL=y # CONFIG_ARM_SCPI_POWER_DOMAIN is not set CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_LTO_CLANG=y +CONFIG_CFI_CLANG=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index 45bd184c0ff2..22d9da85feb1 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -69,6 +69,8 @@ CONFIG_IA32_EMULATION=y CONFIG_OPROFILE=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_LTO_CLANG=y +CONFIG_CFI_CLANG=y CONFIG_REFCOUNT_FULL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64 index ec53d6eac9ea..da780202cb2b 100644 --- a/build.config.cuttlefish.aarch64 +++ b/build.config.cuttlefish.aarch64 @@ -1,5 +1,6 @@ ARCH=arm64 BRANCH=android-4.19 +CC=clang CLANG_TRIPLE=aarch64-linux-gnu- CROSS_COMPILE=aarch64-linux-androidkernel- DEFCONFIG=cuttlefish_defconfig @@ -7,6 +8,7 @@ EXTRA_CMDS='' KERNEL_DIR=common POST_DEFCONFIG_CMDS="check_defconfig" CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin +LD=ld.lld LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin FILES=" arch/arm64/boot/Image.gz diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64 index b49683d476d6..da47330f9835 100644 --- a/build.config.cuttlefish.x86_64 +++ b/build.config.cuttlefish.x86_64 @@ -1,5 +1,6 @@ ARCH=x86_64 BRANCH=android-4.19 +CC=clang CLANG_TRIPLE=x86_64-linux-gnu- CROSS_COMPILE=x86_64-linux-androidkernel- DEFCONFIG=x86_64_cuttlefish_defconfig @@ -7,6 +8,7 @@ EXTRA_CMDS='' KERNEL_DIR=common POST_DEFCONFIG_CMDS="check_defconfig" CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin +LD=ld.lld LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin FILES=" arch/x86/boot/bzImage