--- a/hotspot/src/share/vm/runtime/arguments.cpp	Mon Mar 28 21:21:41 2016 +0800
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed Mar 30 09:52:02 2016 -0700
@@ -3595,6 +3595,11 @@
   }
 #endif
 
+#if !defined(COMPILER2) && !INCLUDE_JVMCI
+  UNSUPPORTED_OPTION(ProfileInterpreter, "ProfileInterpreter");
+  NOT_PRODUCT(UNSUPPORTED_OPTION(TraceProfileInterpreter, "TraceProfileInterpreter"));
+#endif
+
 #ifndef TIERED
   // Tiered compilation is undefined.
   UNSUPPORTED_OPTION(TieredCompilation, "TieredCompilation");