abawo/pico-sdk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build without mbedtls submodule initialized, and fix deoptimized debug build (#1067)

Browse Source
This commit is contained in:
Graham Sanderson 2022-10-17 11:34:10 -05:00 committed by GitHub
parent 3bd7a829db
commit b0294d6bf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rp2_common/pico_platform/include/pico/platform.h
View File

@ -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 * \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; uint exception;
asm ("mrs %0, ipsr" : "=l" (exception)); asm ("mrs %0, ipsr" : "=l" (exception));
return exception; return exception;

14
test/kitchen_sink/CMakeLists.txt
View File

@ -142,11 +142,13 @@ if (TARGET pico_cyw43_arch)
target_include_directories(kitchen_sink_lwip_background PRIVATE target_include_directories(kitchen_sink_lwip_background PRIVATE
${CMAKE_CURRENT_LIST_DIR}) ${CMAKE_CURRENT_LIST_DIR})
target_link_libraries(kitchen_sink_lwip_poll if (TARGET pico_lwip_mbedtls)
pico_lwip_mbedtls target_link_libraries(kitchen_sink_lwip_poll pico_lwip_mbedtls)
pico_mbedtls) target_link_libraries(kitchen_sink_lwip_background pico_lwip_mbedtls)
target_link_libraries(kitchen_sink_lwip_background endif()
pico_lwip_mbedtls if (TARGET pico_mbedtls)
pico_mbedtls) target_link_libraries(kitchen_sink_lwip_poll pico_mbedtls)
target_link_libraries(kitchen_sink_lwip_background pico_mbedtls)
suppress_mbedtls_warnings() suppress_mbedtls_warnings()
endif()
endif() endif()