Mercurial > hg > graal-jvmci-8

diff src/share/vm/utilities/macros.hpp @ 22298:c28cb37b2e1d
Rename JVMCI to INCLUDE_JVMCI.
author: twisti
date: Wed, 22 Jul 2015 08:56:03 -0700
parents: be896a1983c0
children: 800a7b2335b0
--- a/src/share/vm/utilities/macros.hpp	Wed Jul 22 15:50:08 2015 +0200
+++ b/src/share/vm/utilities/macros.hpp	Wed Jul 22 08:56:03 2015 -0700
@@ -164,6 +164,20 @@
 #define INCLUDE_TRACE 1
 #endif // INCLUDE_TRACE
 
+#ifndef INCLUDE_JVMCI
+#define INCLUDE_JVMCI 1
+#endif
+
+#if INCLUDE_JVMCI
+#define JVMCI_ONLY(code) code
+#define NOT_JVMCI(code)
+#define IS_JVMCI_DEFINED true
+#else
+#define JVMCI_ONLY(code)
+#define NOT_JVMCI(code) code
+#define IS_JVMCI_DEFINED false
+#endif // JVMCI
+
 // COMPILER1 variant
 #ifdef COMPILER1
 #if defined(COMPILER2) || defined(COMPILERJVMCI)
@@ -191,20 +205,10 @@
 #define NOT_COMPILERJVMCI(code) code
 #endif // COMPILERJVMCI
 
-#if defined(COMPILERJVMCI) && !defined(JVMCI)
-#error "COMPILERJVMCI needs JVMCI to be defined"
+#if defined(COMPILERJVMCI) && !INCLUDE_JVMCI
+#error "COMPILERJVMCI needs INCLUDE_JVMCI=1"
 #endif
 
-#ifdef JVMCI
-#define JVMCI_ONLY(code) code
-#define NOT_JVMCI(code)
-#define IS_JVMCI_DEFINED true
-#else // JVMCI
-#define JVMCI_ONLY(code)
-#define NOT_JVMCI(code) code
-#define IS_JVMCI_DEFINED false
-#endif // JVMCI
-
 #ifdef TIERED
 #define TIERED_ONLY(code) code
 #define NOT_TIERED(code)