From 5c8bf12acf3d4cc4cebf971a6f61508559a28143 Mon Sep 17 00:00:00 2001
From: Damien George
Date: Thu, 30 Apr 2020 12:30:27 +1000
Subject: 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.
---
 examples/embedding/mpconfigport_minimal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/embedding')

diff --git a/examples/embedding/mpconfigport_minimal.h b/examples/embedding/mpconfigport_minimal.h
index 1050d947d..b5ffd376a 100644
--- a/examples/embedding/mpconfigport_minimal.h
+++ b/examples/embedding/mpconfigport_minimal.h
@@ -97,7 +97,7 @@ extern const struct _mp_obj_module_t mp_module_os;
 // Do not change anything beyond this line
 //////////////////////////////////////////
 
-#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
-- 
cgit v1.2.3