Skip to content

Commit 8c7b592

Browse files
committed
fix compilation issues
1 parent c7660b6 commit 8c7b592

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

docs/library/micropython.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Functions
8585
.. function:: heap_locked()
8686

8787
Lock or unlock the heap. When locked no memory allocation can occur and a
88-
`MemoryError` will be raised if any heap allocation is attempted.
88+
`builtins.MemoryError` will be raised if any heap allocation is attempted.
8989
`heap_locked()` returns a true value if the heap is currently locked.
9090

9191
These functions can be nested, ie `heap_lock()` can be called multiple times

py/emitnative.c

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,40 @@
6060
#endif
6161

6262
// CIRCUITPY-CHANGE: force definitions
63-
#ifndef N_X64
64-
#define N_X64 (0)
63+
#ifndef N_ARM
64+
#define N_ARM (0)
6565
#endif
6666

67-
#ifndef N_X86
68-
#define N_X86 (0)
67+
#ifndef N_DEBUG
68+
#define N_DEBUG (0)
69+
#endif
70+
71+
#ifndef N_NLR_SETJMP
72+
#define N_NLR_SETJMP (0)
73+
#endif
74+
75+
#ifndef N_RV32
76+
#define N_RV32 (0)
6977
#endif
7078

7179
#ifndef N_THUMB
7280
#define N_THUMB (0)
7381
#endif
7482

75-
#ifndef N_ARM
76-
#define N_ARM (0)
83+
#ifndef N_X64
84+
#define N_X64 (0)
85+
#endif
86+
87+
#ifndef N_X86
88+
#define N_X86 (0)
7789
#endif
7890

7991
#ifndef N_XTENSA
8092
#define N_XTENSA (0)
8193
#endif
8294

83-
#ifndef N_NLR_SETJMP
84-
#define N_NLR_SETJMP (0)
95+
#ifndef N_XTENSAWIN
96+
#define N_XTENSWIN (0)
8597
#endif
8698

8799
#ifndef N_PRELUDE_AS_BYTES_OBJ

0 commit comments

Comments
 (0)