py: If setjmp NLR implementation is forced, omit native versions.

pfalcon · pfalcon · commit b1ce37d32e1b · 2014-04-30T04:19:20.000+03:00
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-#ifdef __i386__
+#if defined(__i386__) && !MICROPY_NLR_SETJMP
 /* x86 callee save: bx, di, si, bp, sp */
 
     .file   "nlr.s"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#ifdef __thumb2__`
	`1`	`+#if defined(__thumb2__) && !MICROPY_NLR_SETJMP`
`2`	`2`	`/* thumb callee save: bx, bp, sp, r12, r14, r14, r15 */`
`3`	`3`
`4`	`4`	`.syntax unified`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#ifdef __x86_64__`
	`1`	`+#if defined(__x86_64__) && !MICROPY_NLR_SETJMP`
`2`	`2`	`/* x64 callee save: bx, bp, sp, r12, r13, r14, r15 */`
`3`	`3`
`4`	`4`	`.file "nlr.s"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#ifdef __i386__`
	`1`	`+#if defined(__i386__) && !MICROPY_NLR_SETJMP`
`2`	`2`	`/* x86 callee save: bx, di, si, bp, sp */`
`3`	`3`
`4`	`4`	`.file "nlr.s"`