diff --git a/Documentation b/Documentation
index 9ad99e6fed..1972785856 160000
--- a/Documentation
+++ b/Documentation
@@ -1 +1 @@
-Subproject commit 9ad99e6fed5b7b654ce805e6ec77f7d6287746b2
+Subproject commit 197278585682ff0a7caee714f7706a0361b80144
diff --git a/arch b/arch
index 6e383188c0..6fa995b0aa 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 6e383188c0735cb0f813db3d5142541ffd80dad8
+Subproject commit 6fa995b0aac7816b4250c41a737309417f6e2d1e
diff --git a/include/nuttx/timers/rtc.h b/include/nuttx/timers/rtc.h
index 7cbc928d92..a6e3edcc19 100644
--- a/include/nuttx/timers/rtc.h
+++ b/include/nuttx/timers/rtc.h
@@ -291,7 +291,7 @@ struct rtc_time
   int tm_mday;    /* Day of the month (1-31) */
   int tm_mon;     /* Month (0-11) */
   int tm_year;    /* Years since 1900 */
-#ifdef CONFIG_LIBC_LOCALTIME
+#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
   int tm_wday;    /* Day of the week (0-6) (unused) */
   int tm_yday;    /* Day of the year (0-365) (unused) */
   int tm_isdst;   /* Non-0 if daylight savings time is in effect (unused) */
diff --git a/include/time.h b/include/time.h
index 8608c22fdf..0fd4b7611b 100644
--- a/include/time.h
+++ b/include/time.h
@@ -205,7 +205,7 @@ FAR struct tm *localtime_r(FAR const time_t *timep, FAR struct tm *result);
 size_t strftime(FAR char *s, size_t max, FAR const char *format,
                 FAR const struct tm *tm);
 
-#ifdef CONFIG_TIME_EXTENDED
+#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
 FAR char *asctime(FAR const struct tm *tp);
 FAR char *asctime_r(FAR const struct tm *tp, FAR char *buf);
 FAR char *ctime(FAR const time_t *timep);
diff --git a/libc/time/lib_asctime.c b/libc/time/lib_asctime.c
index 6583969dc8..cd15699559 100644
--- a/libc/time/lib_asctime.c
+++ b/libc/time/lib_asctime.c
@@ -41,7 +41,7 @@
 
 #include <time.h>
 
-#ifdef CONFIG_TIME_EXTENDED
+#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
 
 /****************************************************************************
  * Public Functions
@@ -70,4 +70,4 @@ FAR char *asctime(FAR const struct tm *tp)
   return asctime_r(tp, buf);
 }
 
-#endif /* CONFIG_TIME_EXTENDED */
+#endif /* CONFIG_LIBC_LOCALTIME || CONFIG_TIME_EXTENDED */
diff --git a/libc/time/lib_asctimer.c b/libc/time/lib_asctimer.c
index 77ee312796..0235b89c15 100644
--- a/libc/time/lib_asctimer.c
+++ b/libc/time/lib_asctimer.c
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <time.h>
 
-#ifdef CONFIG_TIME_EXTENDED
+#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
 
 /****************************************************************************
  * Private Data
@@ -94,4 +94,4 @@ FAR char *asctime_r(FAR const struct tm *tp, FAR char *buf)
   return buf;
 }
 
-#endif /* CONFIG_TIME_EXTENDED */
+#endif /* CONFIG_LIBC_LOCALTIME || CONFIG_TIME_EXTENDED */
diff --git a/libc/time/lib_ctime.c b/libc/time/lib_ctime.c
index 2d0b8023ab..6d1bcb8efe 100644
--- a/libc/time/lib_ctime.c
+++ b/libc/time/lib_ctime.c
@@ -41,7 +41,7 @@
 
 #include <time.h>
 
-#ifdef CONFIG_TIME_EXTENDED
+#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
 
 /****************************************************************************
  * Public Functions
@@ -79,4 +79,4 @@ FAR char *ctime(FAR const time_t *timep)
 #endif
 }
 
-#endif /* CONFIG_TIME_EXTENDED */
+#endif /* CONFIG_LIBC_LOCALTIME || CONFIG_TIME_EXTENDED */
diff --git a/libc/time/lib_ctimer.c b/libc/time/lib_ctimer.c
index 7f7cf0b31c..935a72bbd6 100644
--- a/libc/time/lib_ctimer.c
+++ b/libc/time/lib_ctimer.c
@@ -41,7 +41,7 @@
 
 #include <time.h>
 
-#ifdef CONFIG_TIME_EXTENDED
+#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
 
 /****************************************************************************
  * Private Data
@@ -80,4 +80,4 @@ FAR char *ctime_r(FAR const time_t *timep, FAR char *buf)
 #endif
 }
 
-#endif /* CONFIG_TIME_EXTENDED */
+#endif /* CONFIG_LIBC_LOCALTIME || CONFIG_TIME_EXTENDED */
diff --git a/libc/time/lib_strftime.c b/libc/time/lib_strftime.c
index 6d338fa66d..fafdedc6b4 100644
--- a/libc/time/lib_strftime.c
+++ b/libc/time/lib_strftime.c
@@ -181,7 +181,7 @@ size_t strftime(FAR char *s, size_t max, FAR const char *format,
 
        switch (*format++)
          {
-#ifdef CONFIG_TIME_EXTENDED
+#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
            /* %a: A three-letter abbreviation for the day of the week. */
 
            case 'a':