From b40cbc8fb428f3d91d00f31a41054d2d77cae710 Mon Sep 17 00:00:00 2001 From: "Charles E. Youse" Date: Mon, 1 Jul 2019 15:31:25 -0700 Subject: [PATCH] cmake: select appropriate Zephyr SDK compiler for CONFIG_X86_LONGMODE We need to use the new x86_64 chain provided by the SDK in long mode. Signed-off-by: Charles E. Youse --- cmake/toolchain/zephyr/0.10/target.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/toolchain/zephyr/0.10/target.cmake b/cmake/toolchain/zephyr/0.10/target.cmake index b8b3dbe4db9..1edce66a626 100644 --- a/cmake/toolchain/zephyr/0.10/target.cmake +++ b/cmake/toolchain/zephyr/0.10/target.cmake @@ -7,7 +7,12 @@ set(CROSS_COMPILE_TARGET_mips mipsel-zephyr-elf) set(CROSS_COMPILE_TARGET_xtensa xtensa-zephyr-elf) set(CROSS_COMPILE_TARGET_arc arc-zephyr-elf) set(CROSS_COMPILE_TARGET_x86_64 x86_64-zephyr-elf) -set(CROSS_COMPILE_TARGET_x86 i586-zephyr-elf) + +if(CONFIG_X86_LONGMODE) + set(CROSS_COMPILE_TARGET_x86 x86_64-zephyr-elf) +else() + set(CROSS_COMPILE_TARGET_x86 i586-zephyr-elf) +endif() set(CROSS_COMPILE_TARGET ${CROSS_COMPILE_TARGET_${ARCH}}) set(SYSROOT_TARGET ${CROSS_COMPILE_TARGET})