From 62f9ddcb821ae24ce81aabc1e32a61146cfc956e Mon Sep 17 00:00:00 2001
From: wuzhenghui <wuzhenghui@espressif.com>
Date: Tue, 12 Jul 2022 21:10:16 +0800
Subject: [PATCH] esp32c6: add newlib support

---
 components/newlib/locks.c              | 2 +-
 components/newlib/newlib_init.c        | 8 ++++++--
 components/newlib/port/esp_time_impl.c | 3 +++
 components/newlib/test/test_newlib.c   | 3 ++-
 components/newlib/test/test_time.c     | 2 ++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/components/newlib/locks.c b/components/newlib/locks.c
index b11c07017e..15f5bd8062 100644
--- a/components/newlib/locks.c
+++ b/components/newlib/locks.c
@@ -384,7 +384,7 @@ void esp_newlib_locks_init(void)
     __sinit_recursive_mutex = (_lock_t) &s_common_recursive_mutex;
     extern _lock_t __sfp_recursive_mutex;
     __sfp_recursive_mutex = (_lock_t) &s_common_recursive_mutex;
-#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP32C2)
+#elif ESP_ROM_HAS_RETARGETABLE_LOCKING
     /* Newlib 3.3.0 is used in ROM, built with _RETARGETABLE_LOCKING.
      * No access to lock variables for the purpose of ECO forward compatibility,
      * however we have an API to initialize lock variables used in the ROM.
diff --git a/components/newlib/newlib_init.c b/components/newlib/newlib_init.c
index bfb0c81143..c59c6d3572 100644
--- a/components/newlib/newlib_init.c
+++ b/components/newlib/newlib_init.c
@@ -33,6 +33,8 @@
 #include "esp32h2/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"
 #endif
 
 static struct _reent s_reent;
@@ -109,7 +111,8 @@ static struct syscall_stub_table s_stub_table = {
     ._printf_float = NULL,
     ._scanf_float = NULL,
 #endif
-#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 \
+    || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6
     /* TODO IDF-2570 : mark that this assert failed in ROM, to avoid confusion between IDF & ROM
        assertion failures (as function names & source file names will be similar)
     */
@@ -132,7 +135,8 @@ void esp_newlib_init(void)
     syscall_table_ptr_pro = syscall_table_ptr_app = &s_stub_table;
 #elif CONFIG_IDF_TARGET_ESP32S2
     syscall_table_ptr_pro = &s_stub_table;
-#elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C2
+#elif CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32H2 \
+    || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6
     syscall_table_ptr = &s_stub_table;
 #endif
 
diff --git a/components/newlib/port/esp_time_impl.c b/components/newlib/port/esp_time_impl.c
index 77485e971a..ec8f8c0b41 100644
--- a/components/newlib/port/esp_time_impl.c
+++ b/components/newlib/port/esp_time_impl.c
@@ -39,6 +39,9 @@
 #elif CONFIG_IDF_TARGET_ESP32C2
 #include "esp32c2/rom/rtc.h"
 #include "esp32c2/rtc.h"
+#elif CONFIG_IDF_TARGET_ESP32C6
+#include "esp32c6/rom/rtc.h"
+#include "esp32c6/rtc.h"
 #endif
 
 
diff --git a/components/newlib/test/test_newlib.c b/components/newlib/test/test_newlib.c
index f58151d3a6..3bf451dec6 100644
--- a/components/newlib/test/test_newlib.c
+++ b/components/newlib/test/test_newlib.c
@@ -146,7 +146,8 @@ TEST_CASE("check if ROM or Flash is used for functions", "[newlib]")
 #if defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_SPIRAM)
     TEST_ASSERT(fn_in_rom(atoi));
     TEST_ASSERT(fn_in_rom(strtol));
-#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP32C2)
+#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32H2)\
+    || defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C6)
     /* S3 and C3 always use these from ROM */
     TEST_ASSERT(fn_in_rom(atoi));
     TEST_ASSERT(fn_in_rom(strtol));
diff --git a/components/newlib/test/test_time.c b/components/newlib/test/test_time.c
index a72ffbe6d7..e43944523d 100644
--- a/components/newlib/test/test_time.c
+++ b/components/newlib/test/test_time.c
@@ -40,6 +40,8 @@
 #include "esp32h2/rtc.h"
 #elif CONFIG_IDF_TARGET_ESP32C2
 #include "esp32c2/rtc.h"
+#elif CONFIG_IDF_TARGET_ESP32C6
+#include "esp32c6/rtc.h"
 #endif
 
 #if portNUM_PROCESSORS == 2