Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/java.cpp @ 8001:db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
Summary: Rename INCLUDE_ALTERNATE_GCS to INCLUDE_ALL_GCS and replace SERIALGC with INCLUDE_ALL_GCS.
Reviewed-by: coleenp, stefank
author | jprovino |
---|---|
date | Wed, 23 Jan 2013 13:02:39 -0500 |
parents | 212c5b9c38e7 |
children | 5fc51c1ecdeb f2110083203d |
comparison
equal
deleted
inserted
replaced
7619:46e60405583b | 8001:db9981fd3124 |
---|---|
62 #include "trace/tracing.hpp" | 62 #include "trace/tracing.hpp" |
63 #include "trace/traceEventTypes.hpp" | 63 #include "trace/traceEventTypes.hpp" |
64 #include "utilities/dtrace.hpp" | 64 #include "utilities/dtrace.hpp" |
65 #include "utilities/globalDefinitions.hpp" | 65 #include "utilities/globalDefinitions.hpp" |
66 #include "utilities/histogram.hpp" | 66 #include "utilities/histogram.hpp" |
67 #include "utilities/macros.hpp" | |
67 #include "utilities/vmError.hpp" | 68 #include "utilities/vmError.hpp" |
68 #ifdef TARGET_ARCH_x86 | 69 #ifdef TARGET_ARCH_x86 |
69 # include "vm_version_x86.hpp" | 70 # include "vm_version_x86.hpp" |
70 #endif | 71 #endif |
71 #ifdef TARGET_ARCH_sparc | 72 #ifdef TARGET_ARCH_sparc |
78 # include "vm_version_arm.hpp" | 79 # include "vm_version_arm.hpp" |
79 #endif | 80 #endif |
80 #ifdef TARGET_ARCH_ppc | 81 #ifdef TARGET_ARCH_ppc |
81 # include "vm_version_ppc.hpp" | 82 # include "vm_version_ppc.hpp" |
82 #endif | 83 #endif |
83 #ifndef SERIALGC | 84 #if INCLUDE_ALL_GCS |
84 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" | 85 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" |
85 #include "gc_implementation/parallelScavenge/psScavenge.hpp" | 86 #include "gc_implementation/parallelScavenge/psScavenge.hpp" |
86 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" | 87 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" |
87 #endif | 88 #endif // INCLUDE_ALL_GCS |
88 #ifdef COMPILER1 | 89 #ifdef COMPILER1 |
89 #include "c1/c1_Compiler.hpp" | 90 #include "c1/c1_Compiler.hpp" |
90 #include "c1/c1_Runtime1.hpp" | 91 #include "c1/c1_Runtime1.hpp" |
91 #endif | 92 #endif |
92 #ifdef COMPILER2 | 93 #ifdef COMPILER2 |