*** old/src/share/vm/runtime/arguments.cpp	Thu Dec 17 17:52:21 2015
--- new/src/share/vm/runtime/arguments.cpp	Thu Dec 17 17:52:20 2015

*** 4195,4205 ****
--- 4195,4205 ----
                "; ignoring UseBiasedLocking flag." );
      }
      UseBiasedLocking = false;
    }
  
! #ifdef ZERO
! #ifdef CC_INTERP
    // Clear flags not supported on zero.
    FLAG_SET_DEFAULT(ProfileInterpreter, false);
    FLAG_SET_DEFAULT(UseBiasedLocking, false);
    LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));
    LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedClassPointers, false));