From b1ea47af4cb06bbbe29b732a94d23fd0d531cdfb Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Fri, 5 Apr 2024 08:47:36 +0200
Subject: [PATCH] fix(newlib): Allow for timefunc customization if not impl

Related https://github.com/espressif/esp-idf/issues/11873
---
 components/newlib/Kconfig | 11 ++++++++---
 components/newlib/time.c  | 19 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/components/newlib/Kconfig b/components/newlib/Kconfig
index 84dddf9e43..c00ab0cc03 100644
--- a/components/newlib/Kconfig
+++ b/components/newlib/Kconfig
@@ -12,7 +12,7 @@ menu "Newlib"
 
             LF: no modification is applied, stdout is sent as is
 
-            CR: each occurence of LF is replaced with CR
+            CR: each occurrence of LF is replaced with CR
 
             This option doesn't affect behavior of the UART driver (drivers/uart.h).
 
@@ -36,7 +36,7 @@ menu "Newlib"
 
             LF: no modification is applied, input is sent to stdin as is
 
-            CR: each occurence of CR is replaced with LF
+            CR: each occurrence of CR is replaced with LF
 
             This option doesn't affect behavior of the UART driver (drivers/uart.h).
 
@@ -93,7 +93,12 @@ menu "Newlib"
                 resolution. Also the gettimeofday function itself may take
                 longer to run.
             - If no timers are used, gettimeofday and time functions
-                return -1 and set errno to ENOSYS.
+                return -1 and set errno to ENOSYS; they are defined as weak,
+                so they could be overridden.
+                If you want to customize gettimeofday() and other time functions,
+                please choose this option and refer to the 'time.c' source file
+                for the exact prototypes of these functions.
+
             - When RTC is used for timekeeping, two RTC_STORE registers are
                 used to keep time in deep sleep mode.
 
diff --git a/components/newlib/time.c b/components/newlib/time.c
index bc23c1b6f0..4b9fc6ca8e 100644
--- a/components/newlib/time.c
+++ b/components/newlib/time.c
@@ -35,6 +35,9 @@
 #endif
 
 #if IMPL_NEWLIB_TIME_FUNCS
+// time functions are implemented -- they should not be weak
+#define WEAK_UNLESS_TIMEFUNC_IMPL
+
 // stores the start time of the slew
 static uint64_t s_adjtime_start_us;
 // is how many microseconds total to slew
@@ -102,9 +105,13 @@ static void adjtime_corr_stop(void)
     }
     _lock_release(&s_time_lock);
 }
+#else
+
+// no time functions are actually implemented -- allow users to override them
+#define WEAK_UNLESS_TIMEFUNC_IMPL __attribute__((weak))
 #endif
 
-int adjtime(const struct timeval *delta, struct timeval *outdelta)
+WEAK_UNLESS_TIMEFUNC_IMPL int adjtime(const struct timeval *delta, struct timeval *outdelta)
 {
 #if IMPL_NEWLIB_TIME_FUNCS
     if (outdelta != NULL) {
@@ -157,7 +164,7 @@ clock_t IRAM_ATTR _times_r(struct _reent *r, struct tms *ptms)
     return (clock_t) tv.tv_sec;
 }
 
-int IRAM_ATTR _gettimeofday_r(struct _reent *r, struct timeval *tv, void *tz)
+WEAK_UNLESS_TIMEFUNC_IMPL int IRAM_ATTR _gettimeofday_r(struct _reent *r, struct timeval *tv, void *tz)
 {
     (void) tz;
 
@@ -174,7 +181,7 @@ int IRAM_ATTR _gettimeofday_r(struct _reent *r, struct timeval *tv, void *tz)
 #endif
 }
 
-int settimeofday(const struct timeval *tv, const struct timezone *tz)
+WEAK_UNLESS_TIMEFUNC_IMPL int settimeofday(const struct timeval *tv, const struct timezone *tz)
 {
     (void) tz;
 #if IMPL_NEWLIB_TIME_FUNCS
@@ -211,7 +218,7 @@ unsigned int sleep(unsigned int seconds)
     return 0;
 }
 
-int clock_settime(clockid_t clock_id, const struct timespec *tp)
+WEAK_UNLESS_TIMEFUNC_IMPL int clock_settime(clockid_t clock_id, const struct timespec *tp)
 {
 #if IMPL_NEWLIB_TIME_FUNCS
     if (tp == NULL) {
@@ -236,7 +243,7 @@ int clock_settime(clockid_t clock_id, const struct timespec *tp)
 #endif
 }
 
-int clock_gettime(clockid_t clock_id, struct timespec *tp)
+WEAK_UNLESS_TIMEFUNC_IMPL int clock_gettime(clockid_t clock_id, struct timespec *tp)
 {
 #if IMPL_NEWLIB_TIME_FUNCS
     if (tp == NULL) {
@@ -267,7 +274,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
 #endif
 }
 
-int clock_getres(clockid_t clock_id, struct timespec *res)
+WEAK_UNLESS_TIMEFUNC_IMPL int clock_getres(clockid_t clock_id, struct timespec *res)
 {
 #if IMPL_NEWLIB_TIME_FUNCS
     if (res == NULL) {