diff options
| author | Mikael Eiman <mikael@eiman.tv> | 2014-01-04 20:27:13 +0100 |
|---|---|---|
| committer | Mikael Eiman <mikael@eiman.tv> | 2014-01-04 20:27:13 +0100 |
| commit | d67091371da5fed82547988864577928e8468b8e (patch) | |
| tree | 7f20d9846735bae3d611dec07bb0f13b6f52d5dc | |
| parent | f53cdd947cacbe273bcef0c68ced83162a16a24a (diff) | |
| download | micropython-d67091371da5fed82547988864577928e8468b8e.tar.gz micropython-d67091371da5fed82547988864577928e8468b8e.zip | |
OSX: fixes to make nlrx64.S with Apple's clang (switched to Apple-specific define instead of __llvm__)
| -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 20a3704fd4..441817b4f3 100644 --- a/py/nlrx64.S +++ b/py/nlrx64.S @@ -5,7 +5,7 @@ .text /* uint nlr_push(rdi=nlr_buf_t *nlr) */ -#ifndef __llvm__ +#ifndef __apple_build_version__ .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 __llvm__ +#ifndef __apple_build_version__ .size nlr_push, .-nlr_push #endif /* void nlr_pop() */ -#ifndef __llvm__ +#ifndef __apple_build_version__ .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 __llvm__ +#ifndef __apple_build_version__ .size nlr_pop, .-nlr_pop #endif /* void nlr_jump(rdi=uint val) */ -#ifndef __llvm__ +#ifndef __apple_build_version__ .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 __llvm__ +#ifndef __apple_build_version__ .size nlr_jump, .-nlr_jump #endif -#ifndef __llvm__ +#ifndef __apple_build_version__ .local nlr_top #endif .comm nlr_top,8,8 |