Mercurial > hg > graal-compiler
comparison src/share/vm/memory/universe.cpp @ 6854:fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
Summary: Change makefiles so that targets and parameters can be overridden by alternate makefiles.
Reviewed-by: dholmes, coleenp
author | jprovino |
---|---|
date | Wed, 10 Oct 2012 14:35:58 -0400 |
parents | 2a48c84f1d04 |
children | 9855b7e559ae |
comparison
equal
deleted
inserted
replaced
6830:81e878c53615 | 6854:fb19af007ffc |
---|---|
750 | 750 |
751 if (UseParallelGC) { | 751 if (UseParallelGC) { |
752 #ifndef SERIALGC | 752 #ifndef SERIALGC |
753 Universe::_collectedHeap = new ParallelScavengeHeap(); | 753 Universe::_collectedHeap = new ParallelScavengeHeap(); |
754 #else // SERIALGC | 754 #else // SERIALGC |
755 fatal("UseParallelGC not supported in java kernel vm."); | 755 fatal("UseParallelGC not supported in this VM."); |
756 #endif // SERIALGC | 756 #endif // SERIALGC |
757 | 757 |
758 } else if (UseG1GC) { | 758 } else if (UseG1GC) { |
759 #ifndef SERIALGC | 759 #ifndef SERIALGC |
760 G1CollectorPolicy* g1p = new G1CollectorPolicy(); | 760 G1CollectorPolicy* g1p = new G1CollectorPolicy(); |
775 gc_policy = new ASConcurrentMarkSweepPolicy(); | 775 gc_policy = new ASConcurrentMarkSweepPolicy(); |
776 } else { | 776 } else { |
777 gc_policy = new ConcurrentMarkSweepPolicy(); | 777 gc_policy = new ConcurrentMarkSweepPolicy(); |
778 } | 778 } |
779 #else // SERIALGC | 779 #else // SERIALGC |
780 fatal("UseConcMarkSweepGC not supported in java kernel vm."); | 780 fatal("UseConcMarkSweepGC not supported in this VM."); |
781 #endif // SERIALGC | 781 #endif // SERIALGC |
782 } else { // default old generation | 782 } else { // default old generation |
783 gc_policy = new MarkSweepPolicy(); | 783 gc_policy = new MarkSweepPolicy(); |
784 } | 784 } |
785 | 785 |