summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lechner <david@pybricks.com>2022-11-17 15:32:19 -0600
committerDamien George <damien@micropython.org>2022-11-18 15:17:29 +1100
commitac5934c96b66555ba8fe43465b34cb2b2a692ff0 (patch)
tree1ae9e7885cf5117dfcaa1d726f94a0c79f5aa9b6
parent5b08e0361e5c38f910444e48c1f0bb29ac3e9f69 (diff)
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 <david@pybricks.com>
-rw-r--r--mpy-cross/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 55aefb65c..fd326439f 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__)