# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1465340808 -7200
# Node ID c4e6710aa7e0179fa8362780a927b34c8ff42b3f
# Parent  098c16f6e0b522191955b75426c0346793d429ae
ignore EnableJVMCI when checking JVMCI options

diff -r 098c16f6e0b5 -r c4e6710aa7e0 jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java	Mon Jun 06 12:41:03 2016 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java	Wed Jun 08 01:06:48 2016 +0200
@@ -81,7 +81,7 @@
         return getClass().getSimpleName();
     }
 
-    public HotSpotVMConfig(CompilerToVM compilerToVm) {
+    HotSpotVMConfig(CompilerToVM compilerToVm) {
         compilerToVm.initializeConfiguration(this);
         assert verifyInitialization();
 
diff -r 098c16f6e0b5 -r c4e6710aa7e0 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Mon Jun 06 12:41:03 2016 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Wed Jun 08 01:06:48 2016 +0200
@@ -2441,7 +2441,7 @@
 #define JVMCI_CHECK3(type, name, doc)        JVMCI_CHECK_FLAG(name)
 #define JVMCI_CHECK4(type, name, value, doc) JVMCI_CHECK_FLAG(name)
 #define JVMCI_CHECK_FLAG(FLAG)                         \
-    if (!FLAG_IS_DEFAULT(FLAG)) {                                   \
+    if (strcmp(#FLAG, "EnableJVMCI") && !FLAG_IS_DEFAULT(FLAG)) {                                   \
       jio_fprintf(defaultStream::error_stream(), "EnableJVMCI must be enabled to use VM option '%s'\n", #FLAG); \
       status = false; \
     }