--- a/hotspot/src/share/vm/prims/jvm.cpp	Thu Oct 08 10:25:45 2015 +0000
+++ b/hotspot/src/share/vm/prims/jvm.cpp	Thu Oct 08 12:49:30 2015 -1000
@@ -424,6 +424,8 @@
     const char* compiler_name = "HotSpot " CSIZE "Client Compiler";
 #elif defined(COMPILER2)
     const char* compiler_name = "HotSpot " CSIZE "Server Compiler";
+#elif INCLUDE_JVMCI
+    #error "INCLUDE_JVMCI should imply TIERED"
 #else
     const char* compiler_name = "";
 #endif // compilers