--- old/make/hotspot/lib/JvmFeatures.gmk	2020-07-31 23:33:50.687913535 -0700
+++ new/make/hotspot/lib/JvmFeatures.gmk	2020-07-31 23:33:50.495906307 -0700
@@ -116,6 +116,8 @@
 ifneq ($(call check-jvm-feature, cds), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_CDS=0
   JVM_EXCLUDE_FILES += \
+      archiveBuilder.cpp \
+      archiveUtils.cpp \
       classListParser.cpp \
       classLoaderExt.cpp \
       dynamicArchive.cpp \
@@ -126,8 +128,7 @@
       metaspaceShared_$(HOTSPOT_TARGET_CPU_ARCH).cpp \
       sharedClassUtil.cpp \
       sharedPathsMiscInfo.cpp \
-      systemDictionaryShared.cpp \
-      #
+      systemDictionaryShared.cpp
 endif
 
 ifneq ($(call check-jvm-feature, nmt), true)