--- a/hotspot/src/share/vm/runtime/arguments.cpp	Fri Apr 08 01:00:10 2016 -0400
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Fri Apr 08 12:36:27 2016 -0400
@@ -3659,6 +3659,11 @@
   }
 #endif
 
+#if !defined(COMPILER2) && !INCLUDE_JVMCI
+  UNSUPPORTED_OPTION(ProfileInterpreter);
+  NOT_PRODUCT(UNSUPPORTED_OPTION(TraceProfileInterpreter));
+#endif
+
 #ifndef TIERED
   // Tiered compilation is undefined.
   UNSUPPORTED_OPTION(TieredCompilation);