Mercurial > hg > graal-compiler
diff src/share/vm/precompiled/precompiled.hpp @ 8124:5fc51c1ecdeb
Merge.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Tue, 05 Mar 2013 23:44:54 +0100 |
| parents | 1baf7f1e3f23 db9981fd3124 |
| children | 836a62f43af9 |
line wrap: on
line diff
--- a/src/share/vm/precompiled/precompiled.hpp Tue Mar 05 21:58:51 2013 +0100 +++ b/src/share/vm/precompiled/precompiled.hpp Tue Mar 05 23:44:54 2013 +0100 @@ -24,6 +24,7 @@ // Precompiled headers are turned off for Sun Studion, // or if the user passes USE_PRECOMPILED_HEADER=0 to the makefiles. + #ifndef DONT_USE_PRECOMPILED_HEADER # include "asm/assembler.hpp" @@ -288,7 +289,7 @@ #ifdef GRAAL # include "graal/graalGlobals.hpp" #endif // GRAAL -#ifndef SERIALGC +#if INCLUDE_ALL_GCS # include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp" # include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" # include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" @@ -317,6 +318,6 @@ # include "gc_implementation/shared/gcAdaptivePolicyCounters.hpp" # include "gc_implementation/shared/gcPolicyCounters.hpp" # include "gc_implementation/shared/parGCAllocBuffer.hpp" -#endif // SERIALGC +#endif // INCLUDE_ALL_GCS #endif // !DONT_USE_PRECOMPILED_HEADER