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

py/nlrx64: Correct the detection of Darwin ABI.

Browse Source 
__APPLE__ tests for an Apple OS and __MACH__ tests that it is based on CMU
Mach.  Using both tests ensures that just Darwin is recognized.
This commit is contained in:
Bob Abeles 2021-05-14 08:05:40 -07:00 committed by Damien George
parent 126b1c7271
commit 7ceccad4e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/nlrx64.c
View File

@ -58,7 +58,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
#else #else
__asm volatile ( __asm volatile (
#if defined(__APPLE__) || defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
"pop %rbp \n" // undo function's prelude "pop %rbp \n" // undo function's prelude
#endif #endif
"movq (%rsp), %rax \n" // load return %rip "movq (%rsp), %rax \n" // load return %rip
@ -70,7 +70,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
"movq %r13, 56(%rdi) \n" // store %r13 into nlr_buf "movq %r13, 56(%rdi) \n" // store %r13 into nlr_buf
"movq %r14, 64(%rdi) \n" // store %r14 into nlr_buf "movq %r14, 64(%rdi) \n" // store %r14 into nlr_buf
"movq %r15, 72(%rdi) \n" // store %r15 into nlr_buf "movq %r15, 72(%rdi) \n" // store %r15 into nlr_buf
#if defined(__APPLE__) || defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
"jmp _nlr_push_tail \n" // do the rest in C "jmp _nlr_push_tail \n" // do the rest in C
#else #else
"jmp nlr_push_tail \n" // do the rest in C "jmp nlr_push_tail \n" // do the rest in C