From e1eae237a30ef84d4507b32d64cf423e1237c417 Mon Sep 17 00:00:00 2001 From: Alexey Lapshin Date: Mon, 7 Jul 2025 19:16:24 +0700 Subject: [PATCH] change(newlib): change CONFIG_NEWLIB* prefix to CONFIG_LIBC_NEWLIB* --- Kconfig | 2 +- components/esp_rom/CMakeLists.txt | 4 ++-- components/newlib/CMakeLists.txt | 2 +- components/newlib/src/esp32-spiram-rom-functions-c.lf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Kconfig b/Kconfig index baacff3cde..8fa992054e 100644 --- a/Kconfig +++ b/Kconfig @@ -233,7 +233,7 @@ mainmenu "Espressif IoT Development Framework Configuration" CONFIG_APP_BUILD_TYPE_RAM=y CONFIG_VFS_SUPPORT_TERMIOS= - CONFIG_NEWLIB_NANO_FORMAT=y + CONFIG_LIBC_NEWLIB_NANO_FORMAT=y CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y CONFIG_ESP_DEBUG_STUBS_ENABLE= CONFIG_ESP_ERR_TO_NAME_LOOKUP= diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt index f3f9958717..78aca34218 100644 --- a/components/esp_rom/CMakeLists.txt +++ b/components/esp_rom/CMakeLists.txt @@ -315,7 +315,7 @@ else() # Regular app build rom_linker_script("newlib") endif() - if(CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT AND CONFIG_LIBC_NEWLIB AND CONFIG_NEWLIB_NANO_FORMAT) + if(CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT AND CONFIG_LIBC_NEWLIB AND CONFIG_LIBC_NEWLIB_NANO_FORMAT) if(NOT CONFIG_ESP_ROM_HAS_NEWLIB_32BIT_TIME AND NOT CONFIG_ESP_ROM_HAS_NEWLIB_NANO_PRINTF_FLOAT_BUG) # Newlib-nano functions contains time_t related functions # and cannot be used if they were compiled with 32 bit time_t @@ -323,7 +323,7 @@ else() # Regular app build endif() endif() - if(CONFIG_ESP_ROM_HAS_NEWLIB_NORMAL_FORMAT AND CONFIG_LIBC_NEWLIB AND NOT CONFIG_NEWLIB_NANO_FORMAT) + if(CONFIG_ESP_ROM_HAS_NEWLIB_NORMAL_FORMAT AND CONFIG_LIBC_NEWLIB AND NOT CONFIG_LIBC_NEWLIB_NANO_FORMAT) rom_linker_script("newlib-normal") endif() endif() diff --git a/components/newlib/CMakeLists.txt b/components/newlib/CMakeLists.txt index 0d23f0f103..d64f23caad 100644 --- a/components/newlib/CMakeLists.txt +++ b/components/newlib/CMakeLists.txt @@ -105,7 +105,7 @@ list(APPEND EXTRA_LINK_FLAGS "-u esp_libc_include_init_funcs") list(APPEND EXTRA_LINK_FLAGS "-u esp_libc_init_funcs") target_link_libraries(${COMPONENT_LIB} INTERFACE "${EXTRA_LINK_FLAGS}") -if(CONFIG_NEWLIB_NANO_FORMAT) +if(CONFIG_LIBC_NEWLIB_NANO_FORMAT) if(CMAKE_C_COMPILER_ID MATCHES "Clang") set(libc_dir_cmd ${CMAKE_C_COMPILER}) string(REPLACE " " ";" cflags_list ${CMAKE_C_FLAGS}) diff --git a/components/newlib/src/esp32-spiram-rom-functions-c.lf b/components/newlib/src/esp32-spiram-rom-functions-c.lf index 1e066d61b1..e00f50a5b6 100644 --- a/components/newlib/src/esp32-spiram-rom-functions-c.lf +++ b/components/newlib/src/esp32-spiram-rom-functions-c.lf @@ -10,7 +10,7 @@ [mapping:libc] archive: - if NEWLIB_NANO_FORMAT = y: + if LIBC_NEWLIB_NANO_FORMAT = y: libc_nano.a else: libc.a