Merge branch 'bugfix/stringop_overflow_warning' into 'master'

bootloader_support: fix stringop-overflow warning with `PERF` compiler optimization See merge request espressif/esp-idf!19932
espressif · Sep 5, 2022 · 6193e4c · 6193e4c
2 parents 4eb98ad + 4aaf02b
commit 6193e4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/components/bootloader_support/src/bootloader_common_loader.c b/components/bootloader_support/src/bootloader_common_loader.c
@@ -151,7 +151,7 @@ static void update_rtc_retain_mem_crc(void)
     rtc_retain_mem->crc = esp_rom_crc32_le(UINT32_MAX, (uint8_t*)rtc_retain_mem, rtc_retain_mem_size());
 }
 
-void bootloader_common_reset_rtc_retain_mem(void)
+NOINLINE_ATTR void bootloader_common_reset_rtc_retain_mem(void)
 {
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wstringop-overflow"

diff --git a/tools/test_apps/system/bootloader_sections/sdkconfig.ci.rtc_retain b/tools/test_apps/system/bootloader_sections/sdkconfig.ci.rtc_retain
@@ -1 +1,2 @@
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
+CONFIG_COMPILER_OPTIMIZATION_PERF=y
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
		CONFIG_COMPILER_OPTIMIZATION_PERF=y