aboutsummaryrefslogtreecommitdiff
path: root/mpy-cross
diff options
context:
space:
mode:
authorDamien George2020-04-30 12:30:27 +1000
committerDamien George2020-04-30 16:49:42 +1000
commit5c8bf12acf3d4cc4cebf971a6f61508559a28143 (patch)
tree57581ff1251c2aa9cde43437e5676fc6c0a98881 /mpy-cross
parent710426024aece6d248c26bef6627bc3fac13f612 (diff)
all: Fix auto-enable of MICROPY_GCREGS_SETJMP to select GC behaviour.
Only enable it if MICROPY_GCREGS_SETJMP is not already defined, and no supported architecture is defined.
Diffstat (limited to 'mpy-cross')
-rw-r--r--mpy-cross/mpconfigport.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 2282e5e08..21d3e12ed 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -68,7 +68,7 @@
#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#if !defined(__x86_64__) || !defined(__i386__) || !defined(__thumb2__) || !defined(__thumb__) || !defined(__arm__)
+#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
// Fall back to setjmp() implementation for discovery of GC pointers in registers.
#define MICROPY_GCREGS_SETJMP (1)
#endif