--- a/hotspot/src/share/vm/runtime/arguments.cpp	Tue Dec 22 11:03:37 2015 +0100
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Tue Dec 22 11:11:29 2015 -0500
@@ -4197,7 +4197,7 @@
     UseBiasedLocking = false;
   }
 
-#ifdef ZERO
+#ifdef CC_INTERP
   // Clear flags not supported on zero.
   FLAG_SET_DEFAULT(ProfileInterpreter, false);
   FLAG_SET_DEFAULT(UseBiasedLocking, false);