Skip to content

Commit 98cd765

Browse files
committed
Merge branch 'bugfix/c5_newlib_tests_v5.5' into 'release/v5.5'
test(newlib): fixed failing C5 ECO2 newlib tests (v5.5) See merge request espressif/esp-idf!39711
2 parents 73747da + 18b6997 commit 98cd765

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

components/newlib/test_apps/newlib/main/test_newlib.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ static bool fn_in_rom(void *fn)
131131
/* Older chips have newlib nano in rom as well, but this is not linked in due to us now using 64 bit time_t
132132
and the ROM code was compiled for 32 bit.
133133
*/
134-
#define PRINTF_NANO_IN_ROM (CONFIG_NEWLIB_NANO_FORMAT && (CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32H21))
134+
#define PRINTF_NANO_IN_ROM (CONFIG_NEWLIB_NANO_FORMAT && ESP_ROM_HAS_NEWLIB_NANO_FORMAT && !ESP_ROM_HAS_NEWLIB_32BIT_TIME && !ESP_ROM_HAS_NEWLIB_NANO_PRINTF_FLOAT_BUG)
135+
135136
#define SSCANF_NANO_IN_ROM (CONFIG_NEWLIB_NANO_FORMAT && CONFIG_IDF_TARGET_ESP32C2)
136137

137138
TEST_CASE("check if ROM or Flash is used for functions", "[newlib]")

0 commit comments

Comments
 (0)