--- a/src/hotspot/share/gc/shared/gcArguments.cpp	Thu Nov 30 17:13:33 2017 +0100
+++ b/src/hotspot/share/gc/shared/gcArguments.cpp	Thu Nov 30 18:32:06 2017 +0100
@@ -38,6 +38,7 @@
 #include "gc/parallel/parallelArguments.hpp"
 #include "gc/cms/cmsArguments.hpp"
 #include "gc/g1/g1Arguments.hpp"
+#include "gc/epsilon/epsilonArguments.hpp"
 #endif
 
 GCArguments* GCArguments::_instance = NULL;
@@ -53,7 +54,7 @@
 
 bool GCArguments::gc_selected() {
 #if INCLUDE_ALL_GCS
-  return UseSerialGC || UseParallelGC || UseParallelOldGC || UseConcMarkSweepGC || UseG1GC;
+  return UseSerialGC || UseParallelGC || UseParallelOldGC || UseConcMarkSweepGC || UseG1GC || UseEpsilonGC;
 #else
   return UseSerialGC;
 #endif // INCLUDE_ALL_GCS
@@ -121,6 +122,8 @@
     _instance = new G1Arguments();
   } else if (UseConcMarkSweepGC) {
     _instance = new CMSArguments();
+  } else if (UseEpsilonGC) {
+    _instance = new EpsilonArguments();
 #endif
   } else if (UseSerialGC) {
     _instance = new SerialArguments();