Mercurial > hg > graal-compiler
diff src/share/vm/runtime/arguments.cpp @ 9077:480d934f62a8
Merge
author | mgerdin |
---|---|
date | Thu, 11 Apr 2013 16:35:34 +0200 |
parents | 68fe50d4f1d5 8be1318fbe77 |
children | 89e4d67fdd2a 63e31ce40bdb 3c0584fec1e6 |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Wed Apr 10 14:26:49 2013 +0200 +++ b/src/share/vm/runtime/arguments.cpp Thu Apr 11 16:35:34 2013 +0200 @@ -1754,11 +1754,15 @@ return false; } +#if !INCLUDE_ALL_GCS +#ifdef ASSERT static bool verify_serial_gc_flags() { return (UseSerialGC && !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC || UseParallelGC || UseParallelOldGC)); } +#endif // ASSERT +#endif // INCLUDE_ALL_GCS // check if do gclog rotation // +UseGCLogFileRotation is a must, @@ -3093,6 +3097,7 @@ } \ } while(0) +#if !INCLUDE_ALL_GCS static void force_serial_gc() { FLAG_SET_DEFAULT(UseSerialGC, true); FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption @@ -3102,6 +3107,7 @@ UNSUPPORTED_GC_OPTION(UseConcMarkSweepGC); UNSUPPORTED_GC_OPTION(UseParNewGC); } +#endif // INCLUDE_ALL_GCS // Parse entry point called from JNI_CreateJavaVM