Skip to content

Commit aa34c55

Browse files
dhylandsdpgeorge
authored andcommitted
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.
1 parent af622eb commit aa34c55

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

py/nlrx64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,5 +258,5 @@ nlr_jump:
258258

259259
#endif // defined(__x86_64__) && !MICROPY_NLR_SETJMP
260260
#if defined(linux)
261-
.section .note.GNU-stack,"",@progbits
261+
.section .note.GNU-stack,"",%progbits
262262
#endif

py/nlrx86.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,5 +191,5 @@ nlr_jump:
191191

192192
#endif // defined(__i386__) && !MICROPY_NLR_SETJMP
193193
#if defined(linux)
194-
.section .note.GNU-stack,"",@progbits
194+
.section .note.GNU-stack,"",%progbits
195195
#endif

py/nlrxtensa.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,5 @@ nlr_jump:
115115

116116
#endif // defined(__xtensa__)
117117
#if defined(linux)
118-
.section .note.GNU-stack,"",@progbits
118+
.section .note.GNU-stack,"",%progbits
119119
#endif

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy