From 5abd8a9fe6a6f1d31ba55ba9bf97f1223506262d Mon Sep 17 00:00:00 2001 From: Jean-Paul Etienne Date: Sun, 6 Aug 2023 00:13:10 +0200 Subject: [PATCH] micropython: fix stackctrl compilation for GCC 13 On host PC using GCC 13, stackctrl.c fails to compile with the following error: ../py/stackctrl.c: In function 'mp_stack_ctrl_init': ../py/stackctrl.c:32:32: error: storing the address of local variable 'stack_dummy' in 'mp_state_ctx.thread.stack_top' [-Werror=dangling-pointer=] 32 | MP_STATE_THREAD(stack_top) = (char *)&stack_dummy; ../py/stackctrl.c:31:18: note: 'stack_dummy' declared here 31 | volatile int stack_dummy; | ^~~~~~~~~~~ In file included from ../py/runtime.h:29, from ../py/stackctrl.c:27: ../py/mpstate.h:296:23: note: 'mp_state_ctx' declared here 296 | extern mp_state_ctx_t mp_state_ctx; | ^~~~~~~~~~~~ cc1: all warnings being treated as errors Fixed accordingly by ignoring -dangling-pointer warning inside mp_stack_ctrl_init function. Signed-off-by: Jean-Paul Etienne (cherry picked from commit 4c1b74ede3a1d8c5b8b1594a01a2048325ee6c23) --- .../patches/050-py-stackctrl-fix-gcc-13.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch diff --git a/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch b/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch new file mode 100644 index 0000000000..8cd7df66e6 --- /dev/null +++ b/lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch @@ -0,0 +1,31 @@ +From f1c6cb7725960487195daa5c5c196fd8d3563811 Mon Sep 17 00:00:00 2001 +From: Damien George +Date: Wed, 3 May 2023 15:23:24 +1000 +Subject: [PATCH] py/stackctrl: Add gcc pragmas to ignore dangling-pointer + warning. + +This warning became apparent in gcc 13. + +Signed-off-by: Damien George +--- + py/stackctrl.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/py/stackctrl.c ++++ b/py/stackctrl.c +@@ -28,8 +28,15 @@ + #include "py/stackctrl.h" + + void mp_stack_ctrl_init(void) { ++ #if __GNUC__ >= 13 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdangling-pointer" ++ #endif + volatile int stack_dummy; + MP_STATE_THREAD(stack_top) = (char *)&stack_dummy; ++ #if __GNUC__ >= 13 ++ #pragma GCC diagnostic pop ++ #endif + } + + void mp_stack_set_top(void *top) { -- 2.30.2