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

*** 25,40 ****
  #ifndef SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
  #define SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
  
  #include "utilities/macros.hpp"
  
- #if INCLUDE_ALL_GCS
  #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f) \
!   f(G1BarrierSet)
! #else
! #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
! #endif
  
  // Do something for each concrete barrier set part of the build.
  #define FOR_EACH_CONCRETE_BARRIER_SET_DO(f)          \
    f(CardTableBarrierSet)                             \
    FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
--- 25,36 ----
  #ifndef SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
  #define SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
  
  #include "utilities/macros.hpp"
  
  #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f) \
!   G1GC_ONLY(f(G1BarrierSet))
  
  // Do something for each concrete barrier set part of the build.
  #define FOR_EACH_CONCRETE_BARRIER_SET_DO(f)          \
    f(CardTableBarrierSet)                             \
    FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)