diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-03-23 13:57:46 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-03-23 13:57:46 +0000 |
| commit | 12140288428da312158e3ef86faf7bae0dc408e8 (patch) | |
| tree | 37f5210b026a9331b637b232483d9bb39c0427f2 | |
| parent | 506589a4b7a3985f34cf9581edc1e486479027e0 (diff) | |
| parent | 606821007a8c96fd23c8ef3a942d62222d2c6ac5 (diff) | |
| download | micropython-12140288428da312158e3ef86faf7bae0dc408e8.tar.gz micropython-12140288428da312158e3ef86faf7bae0dc408e8.zip | |
Merge pull request #354 from xbe/osx-fix
Fix OS X detection.
| -rw-r--r-- | py/nlrx64.S | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/py/nlrx64.S b/py/nlrx64.S index 8f543b445d..c5711001e6 100644 --- a/py/nlrx64.S +++ b/py/nlrx64.S @@ -5,7 +5,7 @@ .text /* uint nlr_push(rdi=nlr_buf_t *nlr) */ -#ifndef __apple_build_version__ +#if !(defined(__APPLE__) && defined(__MACH__)) .globl nlr_push .type nlr_push, @function nlr_push: @@ -27,12 +27,12 @@ _nlr_push: movq %rdi, nlr_top(%rip) # stor new nlr_buf (to make linked list) xorq %rax, %rax # return 0, normal return ret # return -#ifndef __apple_build_version__ +#if !(defined(__APPLE__) && defined(__MACH__)) .size nlr_push, .-nlr_push #endif /* void nlr_pop() */ -#ifndef __apple_build_version__ +#if !(defined(__APPLE__) && defined(__MACH__)) .globl nlr_pop .type nlr_pop, @function nlr_pop: @@ -44,12 +44,12 @@ _nlr_pop: movq (%rax), %rax # load prev nlr_buf movq %rax, nlr_top(%rip) # store prev nlr_buf (to unlink list) ret # return -#ifndef __apple_build_version__ +#if !(defined(__APPLE__) && defined(__MACH__)) .size nlr_pop, .-nlr_pop #endif /* void nlr_jump(rdi=uint val) */ -#ifndef __apple_build_version__ +#if !(defined(__APPLE__) && defined(__MACH__)) .globl nlr_jump .type nlr_jump, @function nlr_jump: @@ -74,11 +74,11 @@ nlr_jump: xorq %rax, %rax # clear return register inc %al # increase to make 1, non-local return ret # return -#ifndef __apple_build_version__ +#if !(defined(__APPLE__) && defined(__MACH__)) .size nlr_jump, .-nlr_jump #endif -#ifndef __apple_build_version__ +#if !(defined(__APPLE__) && defined(__MACH__)) .local nlr_top #endif .comm nlr_top,8,8 |