Merge branch 'main' into ota-s2

3 files changed, 2 insertions, 2 deletions

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index a87147914..94f8ba42e 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -307,6 +307,7 @@ SRC_COMMON_HAL_ALL = \
 	_bleio/__init__.c \
 	_pew/PewPew.c \
 	_pew/__init__.c \
+	alarm/SleepMemory.c \
 	alarm/__init__.c \
 	alarm/pin/PinAlarm.c \
 	alarm/time/TimeAlarm.c \
diff --git a/py/obj.c b/py/obj.c
index d8e34746c..b6462641c 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -125,7 +125,6 @@ void mp_obj_print_exception(const mp_print_t *print, mp_obj_t exc) {
                     mp_printf(print, decompressed_block, block);
                 }
             }
-            mp_obj_exception_clear_traceback(exc);
         }
     }
     mp_obj_print_helper(print, exc, PRINT_EXC);
diff --git a/py/py.mk b/py/py.mk
index 1a8f1219a..3f94aa67a 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -19,7 +19,7 @@ endif
 QSTR_GLOBAL_DEPENDENCIES += $(PY_SRC)/mpconfig.h mpconfigport.h
 
 # some code is performance bottleneck and compiled with other optimization options
-_CSUPEROPT = -O3
+CSUPEROPT = -O3
 
 # this sets the config file for FatFs
 CFLAGS_MOD += -DFFCONF_H=\"lib/oofatfs/ffconf.h\"