From 4dd76525f6010408ffda6df9b8630d0518ed3280 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Mon, 8 Jan 2024 10:06:14 +0000 Subject: [PATCH] CI: Update MicroPython patch for v1.22.1. --- micropython/micropython_nano_specs.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/micropython/micropython_nano_specs.patch b/micropython/micropython_nano_specs.patch index 7801b58a..9a2bc620 100644 --- a/micropython/micropython_nano_specs.patch +++ b/micropython/micropython_nano_specs.patch @@ -1,11 +1,11 @@ diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt -index 094031c6852a..5f268414c08f 100644 +index 281b0c3bc..7e04bb549 100644 --- a/ports/rp2/CMakeLists.txt +++ b/ports/rp2/CMakeLists.txt -@@ -374,6 +374,15 @@ target_compile_options(${MICROPY_TARGET} PRIVATE - target_link_options(${MICROPY_TARGET} PRIVATE - -Wl,--defsym=__micropy_c_heap_size__=${MICROPY_C_HEAP_SIZE} +@@ -453,6 +453,16 @@ target_link_options(${MICROPY_TARGET} PRIVATE + -Wl,--wrap=dcd_event_handler ) + +# Do not include stack unwinding & exception handling for C++ user modules +target_compile_definitions(usermod INTERFACE PICO_CXX_ENABLE_EXCEPTIONS=0) +target_compile_options(usermod INTERFACE $<$: @@ -15,6 +15,7 @@ index 094031c6852a..5f268414c08f 100644 + -fno-use-cxa-atexit +>) +target_link_options(usermod INTERFACE -specs=nano.specs) - ++ set_source_files_properties( ${PICO_SDK_PATH}/src/rp2_common/pico_double/double_math.c + ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_math.c