diff src/share/vm/jvmci/jvmci_globals.hpp @ 23404:3ef45d0a6d77

Remove jvmci VM configuration, and backport UseJVMCICompiler flag.
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 24 May 2016 13:51:28 +0200
parents de8872d1c208
children f84a5ac3be22
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmci_globals.hpp	Fri May 20 15:49:00 2016 +0200
+++ b/src/share/vm/jvmci/jvmci_globals.hpp	Tue May 24 13:51:28 2016 +0200
@@ -46,23 +46,29 @@
 //
 #define JVMCI_FLAGS(develop, develop_pd, product, product_pd, notproduct)   \
                                                                             \
+  product(bool, EnableJVMCI, true,                                          \
+          "Enable JVMCI")                                                   \
+                                                                            \
+  product(bool, UseJVMCICompiler, false,                                    \
+          "Use JVMCI as the default compiler")                              \
+                                                                            \
   product(bool, UseJVMCIClassLoader, true,                                  \
           "Load JVMCI classes with separate class loader")                  \
                                                                             \
   product(ccstr, JVMCIServicesDir, NULL,                                    \
           "Alternate directory to use for JVMCI services")                  \
                                                                             \
-  COMPILERJVMCI_PRESENT(product(bool, BootstrapJVMCI, false,                \
-          "Bootstrap JVMCI before running Java main method"))               \
+  product(bool, BootstrapJVMCI, false,                                      \
+          "Bootstrap JVMCI before running Java main method")                \
                                                                             \
-  COMPILERJVMCI_PRESENT(product(bool, PrintBootstrap, true,                 \
-          "Print JVMCI bootstrap progress and summary"))                    \
+  product(bool, PrintBootstrap, true,                                       \
+          "Print JVMCI bootstrap progress and summary")                     \
                                                                             \
-  COMPILERJVMCI_PRESENT(product(intx, JVMCIThreads, 1,                      \
-          "Force number of JVMCI compiler threads to use"))                 \
+  product(intx, JVMCIThreads, 1,                                            \
+          "Force number of JVMCI compiler threads to use")                  \
                                                                             \
-  COMPILERJVMCI_PRESENT(product(intx, JVMCIHostThreads, 1,                  \
-          "Force number of compiler threads for JVMCI host compiler"))      \
+  product(intx, JVMCIHostThreads, 1,                                        \
+          "Force number of compiler threads for JVMCI host compiler")       \
                                                                             \
   JVMCI_ONLY(product(bool, CodeInstallSafepointChecks, true,                \
           "Perform explicit safepoint checks while installing code"))       \