Merge remote-tracking branch 'origin/main'

2022-12-21 14:40:11 +01:00 · 2022-12-21 14:40:11 +01:00 · 600d7c90b6
commit 600d7c90b6
parent 826116879b 2f1476874a
1 changed files with 1 additions and 1 deletions
--- a/py/nlrthumb.c
+++ b/py/nlrthumb.c
@ -36,7 +36,7 @@
 // For reference, arm/thumb callee save regs are:
 //      r4-r11, r13=sp

-__attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) {
+__attribute__((naked, returns_twice)) unsigned int nlr_push(nlr_buf_t *nlr) {

    __asm volatile (
        "str    r4, [r0, #12]       \n" // store r4 into nlr_buf