--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp	Wed Apr 11 13:51:33 2018 +0200
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp	Wed Apr 11 13:52:23 2018 +0200
@@ -1659,9 +1659,11 @@
     __ move(dirty, card_addr);
     __ branch_destination(L_already_dirty->label());
   } else {
+#if INCLUDE_ALL_GCS
     if (UseConcMarkSweepGC && CMSPrecleaningEnabled) {
       __ membar_storestore();
     }
+#endif
     __ move(dirty, card_addr);
   }
 #endif

--- a/src/hotspot/share/code/codeCache.cpp	Wed Apr 11 13:51:33 2018 +0200
+++ b/src/hotspot/share/code/codeCache.cpp	Wed Apr 11 13:52:23 2018 +0200
@@ -51,6 +51,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sweeper.hpp"
+#include "runtime/vmThread.hpp"
 #include "services/memoryService.hpp"
 #include "trace/tracing.hpp"
 #include "utilities/align.hpp"

--- a/src/hotspot/share/oops/klass.hpp	Wed Apr 11 13:51:33 2018 +0200
+++ b/src/hotspot/share/oops/klass.hpp	Wed Apr 11 13:52:23 2018 +0200
@@ -166,7 +166,7 @@
 #endif
   // The _archived_mirror is set at CDS dump time pointing to the cached mirror
   // in the open archive heap region when archiving java object is supported.
-  CDS_JAVA_HEAP_ONLY(narrowOop _archived_mirror);
+  CDS_JAVA_HEAP_ONLY(narrowOop _archived_mirror;)
 
   friend class SharedClassUtil;
 protected:

--- a/src/hotspot/share/runtime/arguments.hpp	Wed Apr 11 13:51:33 2018 +0200
+++ b/src/hotspot/share/runtime/arguments.hpp	Wed Apr 11 13:52:23 2018 +0200
@@ -703,7 +703,7 @@
 
   static void check_unsupported_dumping_properties() NOT_CDS_RETURN;
 
-  static bool check_unsupported_cds_runtime_properties() NOT_CDS_RETURN;
+  static bool check_unsupported_cds_runtime_properties() NOT_CDS_RETURN0;
 
   static bool atojulong(const char *s, julong* result);
 };

--- a/src/hotspot/share/runtime/thread.cpp	Wed Apr 11 13:51:33 2018 +0200
+++ b/src/hotspot/share/runtime/thread.cpp	Wed Apr 11 13:52:23 2018 +0200
@@ -106,6 +106,7 @@
 #include "trace/traceMacros.hpp"
 #include "trace/tracing.hpp"
 #include "utilities/align.hpp"
+#include "utilities/copy.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
@@ -3891,10 +3892,12 @@
   // cache the system and platform class loaders
   SystemDictionary::compute_java_loaders(CHECK_JNI_ERR);
 
+#if INCLUDE_CDS
   if (DumpSharedSpaces) {
     // capture the module path info from the ModuleEntryTable
     ClassLoader::initialize_module_path(THREAD);
   }
+#endif
 
 #if INCLUDE_JVMCI
   if (force_JVMCI_intialization) {

--- a/src/hotspot/share/services/memTracker.hpp	Wed Apr 11 13:51:33 2018 +0200
+++ b/src/hotspot/share/services/memTracker.hpp	Wed Apr 11 13:52:23 2018 +0200
@@ -41,7 +41,7 @@
      release
   };
   Tracker(enum TrackerType type) : _type(type) { }
-  void record(address addr, size_t size);
+  void record(address addr, size_t size) { }
  private:
   enum TrackerType  _type;
 };
@@ -313,4 +313,3 @@
 #endif // INCLUDE_NMT
 
 #endif // SHARE_VM_SERVICES_MEM_TRACKER_HPP
-

--- a/src/hotspot/share/utilities/macros.hpp	Wed Apr 11 13:51:33 2018 +0200
+++ b/src/hotspot/share/utilities/macros.hpp	Wed Apr 11 13:52:23 2018 +0200
@@ -109,11 +109,13 @@
 #define CDS_ONLY(x) x
 #define NOT_CDS(x)
 #define NOT_CDS_RETURN        /* next token must be ; */
+#define NOT_CDS_RETURN0       /* next token must be ; */
 #define NOT_CDS_RETURN_(code) /* next token must be ; */
 #else
 #define CDS_ONLY(x)
 #define NOT_CDS(x) x
-#define NOT_CDS_RETURN          {}
+#define NOT_CDS_RETURN        {}
+#define NOT_CDS_RETURN0       { return 0; }
 #define NOT_CDS_RETURN_(code) { return code; }
 #endif // INCLUDE_CDS