mirror of
https://github.com/licsber/micropython.git
synced 2024-09-20 00:50:24 +08:00
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.
This commit is contained in:
parent
710426024a
commit
5c8bf12acf
@ -97,7 +97,7 @@ extern const struct _mp_obj_module_t mp_module_os;
|
|||||||
// Do not change anything beyond this line
|
// 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.
|
// Fall back to setjmp() implementation for discovery of GC pointers in registers.
|
||||||
#define MICROPY_GCREGS_SETJMP (1)
|
#define MICROPY_GCREGS_SETJMP (1)
|
||||||
#endif
|
#endif
|
||||||
|
@ -68,7 +68,7 @@
|
|||||||
|
|
||||||
#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
|
#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.
|
// Fall back to setjmp() implementation for discovery of GC pointers in registers.
|
||||||
#define MICROPY_GCREGS_SETJMP (1)
|
#define MICROPY_GCREGS_SETJMP (1)
|
||||||
#endif
|
#endif
|
||||||
|
@ -178,7 +178,7 @@
|
|||||||
|
|
||||||
extern const struct _mp_print_t mp_stderr_print;
|
extern const struct _mp_print_t mp_stderr_print;
|
||||||
|
|
||||||
#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.
|
// Fall back to setjmp() implementation for discovery of GC pointers in registers.
|
||||||
#define MICROPY_GCREGS_SETJMP (1)
|
#define MICROPY_GCREGS_SETJMP (1)
|
||||||
#endif
|
#endif
|
||||||
|
@ -110,7 +110,7 @@ extern const struct _mp_obj_module_t mp_module_os;
|
|||||||
// Do not change anything beyond this line
|
// 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.
|
// Fall back to setjmp() implementation for discovery of GC pointers in registers.
|
||||||
#define MICROPY_GCREGS_SETJMP (1)
|
#define MICROPY_GCREGS_SETJMP (1)
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user