Merge branch 'bugfix/s2_lightsleep_regression' into 'master'

sleep: disable switch-case jump tables from being placed in flash

See merge request espressif/esp-idf!13083
This commit is contained in:
Angus Gratton 2021-04-09 13:56:02 +00:00
commit 1ea54a6496
2 changed files with 5 additions and 4 deletions

View File

@ -17,6 +17,11 @@ if(NOT BOOTLOADER_BUILD)
"mac_addr.c"
"sleep_modes.c")
list(APPEND priv_requires esp_ipc)
if(NOT CMAKE_BUILD_EARLY_EXPANSION)
set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/sleep_modes.c" PROPERTIES
COMPILE_FLAGS "-fno-jump-tables -fno-tree-switch-conversion")
endif()
endif()
idf_component_register(SRCS ${srcs}

View File

@ -52,10 +52,6 @@ else()
PROPERTIES COMPILE_FLAGS
-fno-stack-protector)
if(NOT CMAKE_BUILD_EARLY_EXPANSION)
set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/sleep_modes.c" PROPERTIES
COMPILE_FLAGS "-fno-jump-tables -fno-tree-switch-conversion")
endif()
endif()
if(CONFIG_IDF_ENV_FPGA)