diff --git a/configs/Makefile b/configs/Makefile
index cee8bdafed..61341caa33 100644
--- a/configs/Makefile
+++ b/configs/Makefile
@@ -83,8 +83,8 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
 CXXSRCS = $(CONFIG_CXXSRCS)
 CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT))
 
-SRCS = $(ASRCS) $(CSRCS)
-OBJS = $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS)
+OBJS = $(AOBJS) $(COBJS) $(CXXOBJS)
 
 BIN = libconfigs$(LIBEXT)
 
@@ -100,10 +100,11 @@ $(COBJS): %$(OBJEXT): %.c
 $(CXXOBJS): %$(OBJEXT): %.cxx
 	$(call COMPILEXX, $<, $@)
 
-$(BIN): $(OBJS) $(CXXOBJS)
-	$(call ARCHIVE, $@, $(OBJS) $(CXXOBJS))
+$(BIN): $(OBJS)
+	$(Q) touch $(BIN)  # Archive may not exist
+	$(call ARCHIVE, $@, $(OBJS))
 
-.depend: Makefile $(SRCS) $(CXXSRCS)
+.depend: Makefile $(SRCS)
 ifneq ($(SRCS),)
 	$(Q) $(MKDEP) --dep-path . "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 endif
diff --git a/configs/ez80f910200kitg/README.txt b/configs/ez80f910200kitg/README.txt
index 9f957f4c2a..fbd0963cf5 100644
--- a/configs/ez80f910200kitg/README.txt
+++ b/configs/ez80f910200kitg/README.txt
@@ -62,11 +62,35 @@ Version 5.2.1
 
 Version 5.3.0
 
-  I started verification using 5.30 on June 2, 2019.  There are lots of
-  compile issues; most look like compiler problems (but only a single
-  internal error).  Other errors are the consequence of commits to the
-  OS that did not follow C89.  It will take some time to get a clean
-  compile again.
+  I started verification using 5.30 on June 2, 2019.  To use this toolchain,
+  I had to suppress the gmtime() and gmtimer() because these were causing an
+  internal compiler error:
+
+    time\lib_gmtimer.c
+    P2: Internal Error(0xB47E59):
+            Please contact Technical Support
+
+  This is the change to suppress building these files:
+
+    diff --git a/libs/libc/time/Make.defs b/libs/libc/time/Make.defs
+    index 5c9b746778..8327e287f4 100644
+    --- a/libs/libc/time/Make.defs
+    +++ b/libs/libc/time/Make.defs
+    @@ -44,7 +44,7 @@ ifdef CONFIG_LIBC_LOCALTIME
+     CSRCS += lib_localtime.c lib_asctime.c lib_asctimer.c lib_ctime.c
+     CSRCS += lib_ctimer.c
+     else
+    -CSRCS += lib_mktime.c lib_gmtime.c lib_gmtimer.c
+    +CSRCS += lib_mktime.c # lib_gmtime.c lib_gmtimer.c
+     ifdef CONFIG_TIME_EXTENDED
+     CSRCS += lib_dayofweek.c lib_asctime.c lib_asctimer.c lib_ctime.c
+     CSRCS += lib_ctimer.c
+
+  The consequence is, of course, that these interfaces will not be available
+  to applications.
+
+  Another issue is that the ZDS-II version of stdarg.h does not provide
+  va_copy().  This affects libs/libc/lib_sysloc.c.
 
 Other Versions
   If you use any version of ZDS-II other than 5.1.1, 5.2.1, or 5.3.0 or
diff --git a/configs/ez80f910200zco/README.txt b/configs/ez80f910200zco/README.txt
index 0840e84b5a..a5c65bde8d 100644
--- a/configs/ez80f910200zco/README.txt
+++ b/configs/ez80f910200zco/README.txt
@@ -62,7 +62,9 @@ Version 5.2.1
 
 Version 5.3.0
 
-  I started verification using 5.30 on June 2, 2019.  To you this toolchain, I had to suppress the gmtime() and gmtimer() because these were causing an internal compiler error:
+  I started verification using 5.30 on June 2, 2019.  To use this toolchain,
+  I had to suppress the gmtime() and gmtimer() because these were causing an
+  internal compiler error:
 
     time\lib_gmtimer.c
     P2: Internal Error(0xB47E59):
@@ -87,6 +89,9 @@ Version 5.3.0
   The consequence is, of course, that these interfaces will not be available
   to applications.
 
+  Another issue is that the ZDS-II version of stdarg.h does not provide
+  va_copy().  This affects libs/libc/lib_sysloc.c.
+
 Other Versions
   If you use any version of ZDS-II other than 5.1.1, 5.2.1, or 5.3.0 or
   if you install ZDS-II at any location other than the default location,
diff --git a/configs/z16f2800100zcog/README.txt b/configs/z16f2800100zcog/README.txt
index 5571566425..471ee77db0 100644
--- a/configs/z16f2800100zcog/README.txt
+++ b/configs/z16f2800100zcog/README.txt
@@ -69,8 +69,36 @@ Version 5.0.1
   in those that file and your PATH environment variable.
 
 Version 5.2.1
-  On June 2, 2019, support for the 5.2.1 ZDS-II toolchain was added.  That
-  toolchain is unverified as of tis writing.
+  On June 2, 2019, support for the 5.2.1 ZDS-II toolchain was added.
+  I started verification using 5.30 on June 2, 2019.  To use this toolchain,
+  I had to suppress the gmtime() and gmtimer() because these were causing an
+  internal compiler error:
+
+    time\lib_gmtimer.c
+    P2: Internal Error(0xB47E59):
+            Please contact Technical Support
+
+  This is the change to suppress building these files:
+
+    diff --git a/libs/libc/time/Make.defs b/libs/libc/time/Make.defs
+    index 5c9b746778..8327e287f4 100644
+    --- a/libs/libc/time/Make.defs
+    +++ b/libs/libc/time/Make.defs
+    @@ -44,7 +44,7 @@ ifdef CONFIG_LIBC_LOCALTIME
+     CSRCS += lib_localtime.c lib_asctime.c lib_asctimer.c lib_ctime.c
+     CSRCS += lib_ctimer.c
+     else
+    -CSRCS += lib_mktime.c lib_gmtime.c lib_gmtimer.c
+    +CSRCS += lib_mktime.c # lib_gmtime.c lib_gmtimer.c
+     ifdef CONFIG_TIME_EXTENDED
+     CSRCS += lib_dayofweek.c lib_asctime.c lib_asctimer.c lib_ctime.c
+     CSRCS += lib_ctimer.c
+
+  The consequence is, of course, that these interfaces will not be available
+  to applications.
+
+  Another issue is that the ZDS-II version of stdarg.h does not provide
+  va_copy().  This affects libs/libc/lib_sysloc.c.
 
 Other Versions
 
diff --git a/configs/z16f2800100zcog/scripts/Make.defs b/configs/z16f2800100zcog/scripts/Make.defs
index c9ae6a14d2..71846c9e50 100644
--- a/configs/z16f2800100zcog/scripts/Make.defs
+++ b/configs/z16f2800100zcog/scripts/Make.defs
@@ -189,9 +189,8 @@ define ASSEMBLE
 endef
 
 define MOVEOBJ
-	$(Q) $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
-	$(Q) $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
-	-$(Q) $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
 endef
 
 define ARCHIVE
@@ -224,9 +223,8 @@ define ASSEMBLE
 endef
 
 define MOVEOBJ
-	$(Q) $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
-	$(Q) $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
-	-$(Q) $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
 endef
 
 define ARCHIVE
diff --git a/drivers/bch/bchdev_unregister.c b/drivers/bch/bchdev_unregister.c
index de63604670..a18a2264b7 100644
--- a/drivers/bch/bchdev_unregister.c
+++ b/drivers/bch/bchdev_unregister.c
@@ -73,7 +73,7 @@
 int bchdev_unregister(FAR const char *chardev)
 {
   FAR struct bchlib_s *bch;
-  FAR struct file filestruct;
+  struct file filestruct;
   int ret;
 
   /* Sanity check */