Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bacc1ef5 authored by Alistair Delva's avatar Alistair Delva
Browse files

ANDROID: Fix x86_64 allmodconfig build 



CONFIG_KVM_INTEL depends on asm volatile goto which is about to be
supported in clang, but we haven't landed the upgraded compiler yet.
Suppress use of this kernel feature for now.

In file included from arch/x86/kvm/vmx/vmx.h:11:
arch/x86/kvm/vmx/ops.h:157:2: error: 'asm goto' constructs are not
supported yet
vmx_asm2(vmwrite, "r"(field), "rm"(value), field, value);
^

Change-Id: If21ca65a7bd1e43c5f66a93a6108cf8aa49a9c64
Signed-off-by: default avatarAlistair Delva <adelva@google.com>
parent e496817b

build.config.allmodconfig

+3 −1
Original line number Diff line number Diff line
@@ -2,12 +2,14 @@ DEFCONFIG=allmodconfig 
KCONFIG_ALLCONFIG=${ROOT_DIR}/common/arch/${ARCH%_*}/configs/gki_defconfig



# XFS_FS is currently broken on this branch with clang-9

# KVM_INTEL is broken on this branch due to lack of asm-goto support in clang

POST_DEFCONFIG_CMDS="update_config"

function update_config() {

    ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \

         -d TEST_KMOD  \

         -d XFS_FS \

         -d CPU_BIG_ENDIAN

         -d CPU_BIG_ENDIAN \

         -d KVM_INTEL

    (cd ${OUT_DIR} && \

     make O=${OUT_DIR} $archsubarch CC=${CC} CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)

}