djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #354 from xbe/osx-fix

Browse Source 
Fix OS X detection.
This commit is contained in:
Damien George 2014-03-23 13:57:46 +00:00
commit 1214028842
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
py/nlrx64.S
View File

@ -5,7 +5,7 @@
.text .text
/* uint nlr_push(rdi=nlr_buf_t *nlr) */ /* uint nlr_push(rdi=nlr_buf_t *nlr) */
#ifndef __apple_build_version__ #if !(defined(__APPLE__) && defined(__MACH__))
.globl nlr_push .globl nlr_push
.type nlr_push, @function .type nlr_push, @function
nlr_push: nlr_push:
@ -27,12 +27,12 @@ _nlr_push:
movq %rdi, nlr_top(%rip) # stor new nlr_buf (to make linked list) movq %rdi, nlr_top(%rip) # stor new nlr_buf (to make linked list)
xorq %rax, %rax # return 0, normal return xorq %rax, %rax # return 0, normal return
ret # return ret # return
#ifndef __apple_build_version__ #if !(defined(__APPLE__) && defined(__MACH__))
.size nlr_push, .-nlr_push .size nlr_push, .-nlr_push
#endif #endif
/* void nlr_pop() */ /* void nlr_pop() */
#ifndef __apple_build_version__ #if !(defined(__APPLE__) && defined(__MACH__))
.globl nlr_pop .globl nlr_pop
.type nlr_pop, @function .type nlr_pop, @function
nlr_pop: nlr_pop:
@ -44,12 +44,12 @@ _nlr_pop:
movq (%rax), %rax # load prev nlr_buf movq (%rax), %rax # load prev nlr_buf
movq %rax, nlr_top(%rip) # store prev nlr_buf (to unlink list) movq %rax, nlr_top(%rip) # store prev nlr_buf (to unlink list)
ret # return ret # return
#ifndef __apple_build_version__ #if !(defined(__APPLE__) && defined(__MACH__))
.size nlr_pop, .-nlr_pop .size nlr_pop, .-nlr_pop
#endif #endif
/* void nlr_jump(rdi=uint val) */ /* void nlr_jump(rdi=uint val) */
#ifndef __apple_build_version__ #if !(defined(__APPLE__) && defined(__MACH__))
.globl nlr_jump .globl nlr_jump
.type nlr_jump, @function .type nlr_jump, @function
nlr_jump: nlr_jump:
@ -74,11 +74,11 @@ nlr_jump:
xorq %rax, %rax # clear return register xorq %rax, %rax # clear return register
inc %al # increase to make 1, non-local return inc %al # increase to make 1, non-local return
ret # return ret # return
#ifndef __apple_build_version__ #if !(defined(__APPLE__) && defined(__MACH__))
.size nlr_jump, .-nlr_jump .size nlr_jump, .-nlr_jump
#endif #endif
#ifndef __apple_build_version__ #if !(defined(__APPLE__) && defined(__MACH__))
.local nlr_top .local nlr_top
#endif #endif
.comm nlr_top,8,8 .comm nlr_top,8,8