src/share/vm/runtime/globals_extension.hpp

*** 28,37 ****
--- 28,38 ----
  #include "runtime/globals.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc/g1/g1_globals.hpp"
+ #include "gc/epsilon/epsilon_globals.hpp"
  #endif
  #if INCLUDE_JVMCI
  #include "jvmci/jvmci_globals.hpp"
  #endif
  #ifdef COMPILER1
*** 132,141 ****
--- 133,155 ----
            RUNTIME_MANAGEABLE_FLAG_MEMBER, \
            RUNTIME_PRODUCT_RW_FLAG_MEMBER, \
            IGNORE_RANGE, \
            IGNORE_CONSTRAINT, \
            IGNORE_WRITEABLE)
+  EPSILON_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, \
+           RUNTIME_PD_DEVELOP_FLAG_MEMBER, \
+           RUNTIME_PRODUCT_FLAG_MEMBER, \
+           RUNTIME_PD_PRODUCT_FLAG_MEMBER, \
+           RUNTIME_DIAGNOSTIC_FLAG_MEMBER, \
+           RUNTIME_PD_DIAGNOSTIC_FLAG_MEMBER, \
+           RUNTIME_EXPERIMENTAL_FLAG_MEMBER, \
+           RUNTIME_NOTPRODUCT_FLAG_MEMBER, \
+           RUNTIME_MANAGEABLE_FLAG_MEMBER, \
+           RUNTIME_PRODUCT_RW_FLAG_MEMBER, \
+           IGNORE_RANGE, \
+           IGNORE_CONSTRAINT, \
+           IGNORE_WRITEABLE)
  #endif // INCLUDE_ALL_GCS
  #if INCLUDE_JVMCI
   JVMCI_FLAGS(JVMCI_DEVELOP_FLAG_MEMBER, \
               JVMCI_PD_DEVELOP_FLAG_MEMBER, \
               JVMCI_PRODUCT_FLAG_MEMBER, \
*** 268,277 ****
--- 282,304 ----
            RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
            RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE,
            RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
            RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
            RUNTIME_PD_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
+           RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE,
+           RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE,
+           RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE,
+           RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE,
+           IGNORE_RANGE,
+           IGNORE_CONSTRAINT,
+           IGNORE_WRITEABLE)
+  EPSILON_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE,
+           RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
+           RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE,
+           RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
+           RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
+           RUNTIME_PD_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
            RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE,
            RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE,
            RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE,
            RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE,
            IGNORE_RANGE,