--- old/make/hotspot/lib/JvmFeatures.gmk	2018-05-21 15:02:13.009313041 +0200
+++ new/make/hotspot/lib/JvmFeatures.gmk	2018-05-21 15:02:12.877313154 +0200
@@ -155,6 +155,11 @@
   JVM_EXCLUDE_FILES += psMarkSweep.cpp psMarkSweepDecorator.cpp
 endif
 
+ifneq ($(call check-jvm-feature, epsilongc), true)
+  JVM_CFLAGS_FEATURES += -DINCLUDE_EPSILONGC=0
+  JVM_EXCLUDE_PATTERNS += gc/epsilon
+endif
+
 ifneq ($(call check-jvm-feature, jfr), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_JFR=0
   JVM_EXCLUDE_PATTERNS += jfr