From aa34c553ec75535f46f5d6ff28c0c943701e569b Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Tue, 7 Feb 2017 14:22:55 -0800 Subject: [PATCH] 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. --- py/nlrx64.S | 2 +- py/nlrx86.S | 2 +- py/nlrxtensa.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/py/nlrx64.S b/py/nlrx64.S index fc8b8e3446..78d654558f 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 f1de61e11a..ff0cc21305 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 73af4832ff..6d87e305d4 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