diff options
| author | Dave Hylands <dhylands@gmail.com> | 2017-02-07 14:22:55 -0800 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-02-08 11:12:26 +1100 |
| commit | aa34c553ec75535f46f5d6ff28c0c943701e569b (patch) | |
| tree | 3f2d03772564731c26e24391e22f623460cf8aaf /py | |
| parent | af622eb2a6aa50429eb64716e754ee58c3f87c2e (diff) | |
py/nlr: Fix execstack builds for ARM.
It seems that the gcc toolchain on the RaspberryPi
likes %progbits instead of @progbits. I verified that
%progbits also works under x86, so this should
fix #2848 and fix #2842
I verified that unix and mpy-cross both compile
on my RaspberryPi and on my x64 machine.
Diffstat (limited to 'py')
| -rw-r--r-- | py/nlrx64.S | 2 | ||||
| -rw-r--r-- | py/nlrx86.S | 2 | ||||
| -rw-r--r-- | py/nlrxtensa.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/py/nlrx64.S b/py/nlrx64.S index fc8b8e344..78d654558 100644 --- a/py/nlrx64.S +++ b/py/nlrx64.S @@ -258,5 +258,5 @@ nlr_jump: #endif // defined(__x86_64__) && !MICROPY_NLR_SETJMP #if defined(linux) - .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",%progbits #endif diff --git a/py/nlrx86.S b/py/nlrx86.S index f1de61e11..ff0cc2130 100644 --- a/py/nlrx86.S +++ b/py/nlrx86.S @@ -191,5 +191,5 @@ nlr_jump: #endif // defined(__i386__) && !MICROPY_NLR_SETJMP #if defined(linux) - .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",%progbits #endif diff --git a/py/nlrxtensa.S b/py/nlrxtensa.S index 73af4832f..6d87e305d 100644 --- a/py/nlrxtensa.S +++ b/py/nlrxtensa.S @@ -115,5 +115,5 @@ nlr_jump: #endif // defined(__xtensa__) #if defined(linux) - .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",%progbits #endif |