*** old/src/share/vm/runtime/arguments.cpp	Mon Nov 12 10:52:09 2012
--- new/src/share/vm/runtime/arguments.cpp	Mon Nov 12 10:52:09 2012

*** 1716,1740 ****
--- 1716,1745 ----
                "%s of " UINTX_FORMAT " is invalid; must be between 0 and 100\n",
                name, value);
    return false;
  }
  
+ #ifdef SERIALGC
  static void force_serial_gc() {
    FLAG_SET_DEFAULT(UseSerialGC, true);
    FLAG_SET_DEFAULT(UseParNewGC, false);
    FLAG_SET_DEFAULT(UseConcMarkSweepGC, false);
    FLAG_SET_DEFAULT(CMSIncrementalMode, false);  // special CMS suboption
    FLAG_SET_DEFAULT(UseParallelGC, false);
    FLAG_SET_DEFAULT(UseParallelOldGC, false);
    FLAG_SET_DEFAULT(UseG1GC, false);
  }
  
+ #ifdef ASSERT
  static bool verify_serial_gc_flags() {
    return (UseSerialGC &&
          !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC ||
            UseParallelGC || UseParallelOldGC));
  }
+ #endif // ASSERT
+ 
+ #endif // SERIALGC
  
  // check if do gclog rotation
  // +UseGCLogFileRotation is a must,
  // no gc log rotation when log file not supplied or
  // NumberOfGCLogFiles is 0, or GCLogFileSize is 0