diff --git a/src/rp2_common/pico_platform/include/pico/platform.h b/src/rp2_common/pico_platform/include/pico/platform.h index d930e56..fab7f29 100644 --- a/src/rp2_common/pico_platform/include/pico/platform.h +++ b/src/rp2_common/pico_platform/include/pico/platform.h @@ -396,7 +396,7 @@ __force_inline static int32_t __mul_instruction(int32_t a, int32_t b) { * * \return the exception number if the CPU is handling an exception, or 0 otherwise */ -inline uint __get_current_exception(void) { +static inline uint __get_current_exception(void) { uint exception; asm ("mrs %0, ipsr" : "=l" (exception)); return exception; diff --git a/test/kitchen_sink/CMakeLists.txt b/test/kitchen_sink/CMakeLists.txt index 29b5fe4..4c0a60d 100644 --- a/test/kitchen_sink/CMakeLists.txt +++ b/test/kitchen_sink/CMakeLists.txt @@ -142,11 +142,13 @@ if (TARGET pico_cyw43_arch) target_include_directories(kitchen_sink_lwip_background PRIVATE ${CMAKE_CURRENT_LIST_DIR}) - target_link_libraries(kitchen_sink_lwip_poll - pico_lwip_mbedtls - pico_mbedtls) - target_link_libraries(kitchen_sink_lwip_background - pico_lwip_mbedtls - pico_mbedtls) - suppress_mbedtls_warnings() + if (TARGET pico_lwip_mbedtls) + target_link_libraries(kitchen_sink_lwip_poll pico_lwip_mbedtls) + target_link_libraries(kitchen_sink_lwip_background pico_lwip_mbedtls) + endif() + if (TARGET pico_mbedtls) + target_link_libraries(kitchen_sink_lwip_poll pico_mbedtls) + target_link_libraries(kitchen_sink_lwip_background pico_mbedtls) + suppress_mbedtls_warnings() + endif() endif()