src/hotspot/share/gc/shared/gc_globals.hpp

@@ -23,17 +23,23 @@
  */
 
 #ifndef SHARE_GC_SHARED_GC_GLOBALS_HPP
 #define SHARE_GC_SHARED_GC_GLOBALS_HPP
 
-#include "gc/serial/serial_globals.hpp"
 #include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
+#if INCLUDE_CMSGC
 #include "gc/cms/cms_globals.hpp"
+#endif
+#if INCLUDE_G1GC
 #include "gc/g1/g1_globals.hpp"
+#endif
+#if INCLUDE_PARALLELGC
 #include "gc/parallel/parallel_globals.hpp"
 #endif
+#if INCLUDE_SERIALGC
+#include "gc/serial/serial_globals.hpp"
+#endif
 
 #define GC_FLAGS(develop,                                                   \
                  develop_pd,                                                \
                  product,                                                   \
                  product_pd,                                                \

@@ -46,11 +52,11 @@
                  lp64_product,                                              \
                  range,                                                     \
                  constraint,                                                \
                  writeable)                                                 \
                                                                             \
-  ALL_GCS_ONLY(GC_CMS_FLAGS(                                                \
+  CMSGC_ONLY(GC_CMS_FLAGS(                                                  \
     develop,                                                                \
     develop_pd,                                                             \
     product,                                                                \
     product_pd,                                                             \
     diagnostic,                                                             \

@@ -62,11 +68,11 @@
     lp64_product,                                                           \
     range,                                                                  \
     constraint,                                                             \
     writeable))                                                             \
                                                                             \
-  ALL_GCS_ONLY(GC_G1_FLAGS(                                                 \
+  G1GC_ONLY(GC_G1_FLAGS(                                                    \
     develop,                                                                \
     develop_pd,                                                             \
     product,                                                                \
     product_pd,                                                             \
     diagnostic,                                                             \

@@ -78,11 +84,11 @@
     lp64_product,                                                           \
     range,                                                                  \
     constraint,                                                             \
     writeable))                                                             \
                                                                             \
-  ALL_GCS_ONLY(GC_PARALLEL_FLAGS(                                           \
+  PARALLELGC_ONLY(GC_PARALLEL_FLAGS(                                        \
     develop,                                                                \
     develop_pd,                                                             \
     product,                                                                \
     product_pd,                                                             \
     diagnostic,                                                             \

@@ -94,11 +100,11 @@
     lp64_product,                                                           \
     range,                                                                  \
     constraint,                                                             \
     writeable))                                                             \
                                                                             \
-  GC_SERIAL_FLAGS(                                                          \
+  SERIALGC_ONLY(GC_SERIAL_FLAGS(                                            \
     develop,                                                                \
     develop_pd,                                                             \
     product,                                                                \
     product_pd,                                                             \
     diagnostic,                                                             \

@@ -108,11 +114,11 @@
     manageable,                                                             \
     product_rw,                                                             \
     lp64_product,                                                           \
     range,                                                                  \
     constraint,                                                             \
-    writeable)                                                              \
+    writeable))                                                             \
                                                                             \
   /* gc */                                                                  \
                                                                             \
   product(bool, UseConcMarkSweepGC, false,                                  \
           "Use Concurrent Mark-Sweep GC in the old generation")             \