--- a/src/hotspot/share/gc/shared/gc_globals.hpp Wed May 30 10:29:41 2018 +0200
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp Wed May 30 10:47:43 2018 +0200
@@ -29,6 +29,9 @@
#if INCLUDE_CMSGC
#include "gc/cms/cms_globals.hpp"
#endif
+#if INCLUDE_EPSILONGC
+#include "gc/epsilon/epsilon_globals.hpp"
+#endif
#if INCLUDE_G1GC
#include "gc/g1/g1_globals.hpp"
#endif
@@ -38,9 +41,6 @@
#if INCLUDE_SERIALGC
#include "gc/serial/serial_globals.hpp"
#endif
-#if INCLUDE_EPSILONGC
-#include "gc/epsilon/epsilon_globals.hpp"
-#endif
#define GC_FLAGS(develop, \
develop_pd, \
@@ -73,6 +73,22 @@
constraint, \
writeable)) \
\
+ EPSILONGC_ONLY(GC_EPSILON_FLAGS( \
+ develop, \
+ develop_pd, \
+ product, \
+ product_pd, \
+ diagnostic, \
+ diagnostic_pd, \
+ experimental, \
+ notproduct, \
+ manageable, \
+ product_rw, \
+ lp64_product, \
+ range, \
+ constraint, \
+ writeable)) \
+ \
G1GC_ONLY(GC_G1_FLAGS( \
develop, \
develop_pd, \
@@ -121,22 +137,6 @@
constraint, \
writeable)) \
\
- EPSILONGC_ONLY(GC_EPSILON_FLAGS( \
- develop, \
- develop_pd, \
- product, \
- product_pd, \
- diagnostic, \
- diagnostic_pd, \
- experimental, \
- notproduct, \
- manageable, \
- product_rw, \
- lp64_product, \
- range, \
- constraint, \
- writeable)) \
- \
/* gc */ \
\
product(bool, UseConcMarkSweepGC, false, \