diff --git a/components/app_trace/gcov/gcov_rtio.c b/components/app_trace/gcov/gcov_rtio.c index d140d8c3b3..fe1468040c 100644 --- a/components/app_trace/gcov/gcov_rtio.c +++ b/components/app_trace/gcov/gcov_rtio.c @@ -18,11 +18,6 @@ #include "esp_private/esp_ipc.h" #include "esp_attr.h" #include "hal/wdt_hal.h" -#if CONFIG_IDF_TARGET_ESP32 -#include "esp32/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32S2 -#include "esp32s2/rom/libc_stubs.h" -#endif #if CONFIG_APPTRACE_GCOV_ENABLE diff --git a/components/esp_rom/include/esp_rom_libc_stubs.h b/components/esp_rom/include/esp_rom_libc_stubs.h new file mode 100644 index 0000000000..7db1a26281 --- /dev/null +++ b/components/esp_rom/include/esp_rom_libc_stubs.h @@ -0,0 +1,30 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#pragma once + +#include "sdkconfig.h" + +#if CONFIG_IDF_TARGET_ESP32 +#include "esp32/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32S2 +#include "esp32s2/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32S3 +#include "esp32s3/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32C3 +#include "esp32c3/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32C2 +#include "esp32c2/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32C6 +#include "esp32c6/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32C61 //TODO: IDF-9526, refactor this +#include "esp32c61/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32C5 +#include "esp32c5/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32H2 +#include "esp32h2/rom/libc_stubs.h" +#elif CONFIG_IDF_TARGET_ESP32P4 +#include "esp32p4/rom/libc_stubs.h" +#endif diff --git a/components/newlib/newlib_init.c b/components/newlib/newlib_init.c index 26365b8992..362e2a80f3 100644 --- a/components/newlib/newlib_init.c +++ b/components/newlib/newlib_init.c @@ -20,30 +20,9 @@ #include "esp_attr.h" #include "soc/soc_caps.h" #include "esp_rom_caps.h" +#include "esp_rom_libc_stubs.h" #include "esp_private/startup_internal.h" -#if CONFIG_IDF_TARGET_ESP32 -#include "esp32/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32S2 -#include "esp32s2/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32S3 -#include "esp32s3/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32C3 -#include "esp32c3/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32C2 -#include "esp32c2/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32C6 -#include "esp32c6/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32C61 //TODO: IDF-9526, refactor this -#include "esp32c61/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32C5 -#include "esp32c5/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32H2 -#include "esp32h2/rom/libc_stubs.h" -#elif CONFIG_IDF_TARGET_ESP32P4 -#include "esp32p4/rom/libc_stubs.h" -#endif - extern int _printf_float(struct _reent *rptr, void *pdata, FILE * fp,