diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-04-30 04:19:20 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-04-30 04:19:20 +0300 |
| commit | b1ce37d32e1b77373a86d27d1f1f925891a402d1 (patch) | |
| tree | 524b58d1b2f3c9a4a1e4484d378ecdebb0ec798c | |
| parent | 851c856585f76e1d9bc9e0692bcb3150d7641c8a (diff) | |
| download | micropython-b1ce37d32e1b77373a86d27d1f1f925891a402d1.tar.gz micropython-b1ce37d32e1b77373a86d27d1f1f925891a402d1.zip | |
py: If setjmp NLR implementation is forced, omit native versions.
| -rw-r--r-- | py/nlrthumb.S | 2 | ||||
| -rw-r--r-- | py/nlrx64.S | 2 | ||||
| -rw-r--r-- | py/nlrx86.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/py/nlrthumb.S b/py/nlrthumb.S index 6a0c7ee1e1..86e4919969 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 929a348caf..8e49027afb 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 145bdb9da0..52846b0d57 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" |