ANDROID: KVM: arm64: disable CFI for hypervisor code

Disable LTO+CFI for code that runs at EL2 to avoid address space confusion as the CFI jump tables point to EL1 addresses. Bug: 145210207 Change-Id: I81359ec648b2616e85dfd3bb399327bac980b3fe Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
2018-04-23 12:52:07 -07:00
parent 4c81c26cdc
commit 2df99b6397
2 changed files with 4 additions and 0 deletions
@@ -4,6 +4,7 @@
 #

 ccflags-y += -I $(srctree)/$(src)
+CFLAGS_REMOVE_debug.o += $(CC_FLAGS_CFI)

 KVM=../../../virt/kvm

@@ -11,3 +11,6 @@ subdir-ccflags-y := -I$(incdir)				\
 		    $(DISABLE_STACKLEAK_PLUGIN)

 obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o smccc_wa.o
+
+# Disable LTO+CFI for the files in this directory
+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO), $(KBUILD_CFLAGS))