From b1ce37d32e1b77373a86d27d1f1f925891a402d1 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Wed, 30 Apr 2014 04:19:20 +0300
Subject: [PATCH] py: If setjmp NLR implementation is forced, omit native
versions.
---
py/nlrthumb.S | 2 +-
py/nlrx64.S | 2 +-
py/nlrx86.S | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/py/nlrthumb.S b/py/nlrthumb.S
index 6a0c7ee1e..86e491996 100644
--- a/py/nlrthumb.S
+++ b/py/nlrthumb.S
@@ -1,4 +1,4 @@
-#ifdef __thumb2__
+#if defined(__thumb2__) && !MICROPY_NLR_SETJMP
/* thumb callee save: bx, bp, sp, r12, r14, r14, r15 */
.syntax unified
diff --git a/py/nlrx64.S b/py/nlrx64.S
index 929a348ca..8e49027af 100644
--- a/py/nlrx64.S
+++ b/py/nlrx64.S
@@ -1,4 +1,4 @@
-#ifdef __x86_64__
+#if defined(__x86_64__) && !MICROPY_NLR_SETJMP
/* x64 callee save: bx, bp, sp, r12, r13, r14, r15 */
.file "nlr.s"
diff --git a/py/nlrx86.S b/py/nlrx86.S
index 145bdb9da..52846b0d5 100644
--- a/py/nlrx86.S
+++ b/py/nlrx86.S
@@ -1,4 +1,4 @@
-#ifdef __i386__
+#if defined(__i386__) && !MICROPY_NLR_SETJMP
/* x86 callee save: bx, di, si, bp, sp */
.file "nlr.s"
--
GitLab