From ac5934c96b66555ba8fe43465b34cb2b2a692ff0 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Thu, 17 Nov 2022 15:32:19 -0600 Subject: [PATCH] mpy-cross/main: Add MSVC-compatible architecture checks. MSVC doesn't define `__i386__` or `__x86_64__` so we have to check `_M_IX86` and `_M_X64` as well. Signed-off-by: David Lechner --- mpy-cross/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpy-cross/main.c b/mpy-cross/main.c index 55aefb65c1..fd326439f1 100644 --- a/mpy-cross/main.c +++ b/mpy-cross/main.c @@ -283,10 +283,10 @@ MP_NOINLINE int main_(int argc, char **argv) { mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_XTENSAWIN; mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_XTENSAWIN; } else if (strcmp(arch, "host") == 0) { - #if defined(__i386__) + #if defined(__i386__) || defined(_M_IX86) mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X86; mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_X86; - #elif defined(__x86_64__) + #elif defined(__x86_64__) || defined(_M_X64) mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X64; mp_dynamic_compiler.nlr_buf_num_regs = MAX(MICROPY_NLR_NUM_REGS_X64, MICROPY_NLR_NUM_REGS_X64_WIN); #elif defined(__arm__) && !defined(__thumb2__)