aboutsummaryrefslogtreecommitdiff
path: root/py/nlrx64.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2017-12-28 16:18:39 +1100
committerDamien George <damien.p.george@gmail.com>2017-12-28 16:18:39 +1100
commit5bf8e85fc828974199d469db711aa2f9649c467b (patch)
tree114c8566cf47e5083f2a042eae1b4165bda30005 /py/nlrx64.c
parent97cc48553828ed091325d0d3922eb4cd6c377221 (diff)
py/nlr: Clean up selection and config of NLR implementation.
If MICROPY_NLR_SETJMP is not enabled and the machine is auto-detected then nlr.h now defines some convenience macros for the individual NLR implementations to use (eg MICROPY_NLR_THUMB). This keeps nlr.h and the implementation in sync, and also makes the nlr_buf_t struct easier to read.
Diffstat (limited to 'py/nlrx64.c')
-rw-r--r--py/nlrx64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/py/nlrx64.c b/py/nlrx64.c
index ddcd76166..927b21591 100644
--- a/py/nlrx64.c
+++ b/py/nlrx64.c
@@ -26,7 +26,7 @@
#include "py/mpstate.h"
-#if !MICROPY_NLR_SETJMP && defined(__x86_64__)
+#if MICROPY_NLR_X64
#undef nlr_push
@@ -138,4 +138,4 @@ NORETURN void nlr_jump(void *val) {
for (;;); // needed to silence compiler warning
}
-#endif // !MICROPY_NLR_SETJMP && defined(__x86_64__)
+#endif // MICROPY_NLR_X64