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

*** 23,39 ****
   */
  
  #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
  #include "gc/cms/cms_globals.hpp"
  #include "gc/g1/g1_globals.hpp"
  #include "gc/parallel/parallel_globals.hpp"
  #endif
  
  #define GC_FLAGS(develop,                                                   \
                   develop_pd,                                                \
                   product,                                                   \
                   product_pd,                                                \
--- 23,45 ----
   */
  
  #ifndef SHARE_GC_SHARED_GC_GLOBALS_HPP
  #define SHARE_GC_SHARED_GC_GLOBALS_HPP
  
  #include "utilities/macros.hpp"
! #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,56 ****
                   lp64_product,                                              \
                   range,                                                     \
                   constraint,                                                \
                   writeable)                                                 \
                                                                              \
!   ALL_GCS_ONLY(GC_CMS_FLAGS(                                                \
      develop,                                                                \
      develop_pd,                                                             \
      product,                                                                \
      product_pd,                                                             \
      diagnostic,                                                             \
--- 52,62 ----
                   lp64_product,                                              \
                   range,                                                     \
                   constraint,                                                \
                   writeable)                                                 \
                                                                              \
!   CMSGC_ONLY(GC_CMS_FLAGS(                                                  \
      develop,                                                                \
      develop_pd,                                                             \
      product,                                                                \
      product_pd,                                                             \
      diagnostic,                                                             \
*** 62,72 ****
      lp64_product,                                                           \
      range,                                                                  \
      constraint,                                                             \
      writeable))                                                             \
                                                                              \
!   ALL_GCS_ONLY(GC_G1_FLAGS(                                                 \
      develop,                                                                \
      develop_pd,                                                             \
      product,                                                                \
      product_pd,                                                             \
      diagnostic,                                                             \
--- 68,78 ----
      lp64_product,                                                           \
      range,                                                                  \
      constraint,                                                             \
      writeable))                                                             \
                                                                              \
!   G1GC_ONLY(GC_G1_FLAGS(                                                    \
      develop,                                                                \
      develop_pd,                                                             \
      product,                                                                \
      product_pd,                                                             \
      diagnostic,                                                             \
*** 78,88 ****
      lp64_product,                                                           \
      range,                                                                  \
      constraint,                                                             \
      writeable))                                                             \
                                                                              \
!   ALL_GCS_ONLY(GC_PARALLEL_FLAGS(                                           \
      develop,                                                                \
      develop_pd,                                                             \
      product,                                                                \
      product_pd,                                                             \
      diagnostic,                                                             \
--- 84,94 ----
      lp64_product,                                                           \
      range,                                                                  \
      constraint,                                                             \
      writeable))                                                             \
                                                                              \
!   PARALLELGC_ONLY(GC_PARALLEL_FLAGS(                                        \
      develop,                                                                \
      develop_pd,                                                             \
      product,                                                                \
      product_pd,                                                             \
      diagnostic,                                                             \
*** 94,104 ****
      lp64_product,                                                           \
      range,                                                                  \
      constraint,                                                             \
      writeable))                                                             \
                                                                              \
!   GC_SERIAL_FLAGS(                                                          \
      develop,                                                                \
      develop_pd,                                                             \
      product,                                                                \
      product_pd,                                                             \
      diagnostic,                                                             \
--- 100,110 ----
      lp64_product,                                                           \
      range,                                                                  \
      constraint,                                                             \
      writeable))                                                             \
                                                                              \
!   SERIALGC_ONLY(GC_SERIAL_FLAGS(                                            \
      develop,                                                                \
      develop_pd,                                                             \
      product,                                                                \
      product_pd,                                                             \
      diagnostic,                                                             \
*** 108,118 ****
      manageable,                                                             \
      product_rw,                                                             \
      lp64_product,                                                           \
      range,                                                                  \
      constraint,                                                             \
!     writeable)                                                              \
                                                                              \
    /* gc */                                                                  \
                                                                              \
    product(bool, UseConcMarkSweepGC, false,                                  \
            "Use Concurrent Mark-Sweep GC in the old generation")             \
--- 114,124 ----
      manageable,                                                             \
      product_rw,                                                             \
      lp64_product,                                                           \
      range,                                                                  \
      constraint,                                                             \
!     writeable))                                                             \
                                                                              \
    /* gc */                                                                  \
                                                                              \
    product(bool, UseConcMarkSweepGC, false,                                  \
            "Use Concurrent Mark-Sweep GC in the old generation")             \