1.1 --- a/src/share/vm/runtime/globals.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/runtime/globals.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -29,10 +29,11 @@
1.4 #include "runtime/globals.hpp"
1.5 #include "runtime/globals_extension.hpp"
1.6 #include "utilities/ostream.hpp"
1.7 +#include "utilities/macros.hpp"
1.8 #include "utilities/top.hpp"
1.9 -#ifndef SERIALGC
1.10 +#if INCLUDE_ALL_GCS
1.11 #include "gc_implementation/g1/g1_globals.hpp"
1.12 -#endif
1.13 +#endif // INCLUDE_ALL_GCS
1.14 #ifdef COMPILER1
1.15 #include "c1/c1_globals.hpp"
1.16 #endif
1.17 @@ -256,9 +257,9 @@
1.18 static Flag flagTable[] = {
1.19 RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT, RUNTIME_LP64_PRODUCT_FLAG_STRUCT)
1.20 RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT)
1.21 -#ifndef SERIALGC
1.22 +#if INCLUDE_ALL_GCS
1.23 G1_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT)
1.24 -#endif // SERIALGC
1.25 +#endif // INCLUDE_ALL_GCS
1.26 #ifdef COMPILER1
1.27 C1_FLAGS(C1_DEVELOP_FLAG_STRUCT, C1_PD_DEVELOP_FLAG_STRUCT, C1_PRODUCT_FLAG_STRUCT, C1_PD_PRODUCT_FLAG_STRUCT, C1_NOTPRODUCT_FLAG_STRUCT)
1.28 #endif
