--- a/src/share/vm/utilities/macros.hpp	Mon Mar 10 16:20:45 2014 +0100
+++ b/src/share/vm/utilities/macros.hpp	Mon Mar 10 16:26:10 2014 +0100
@@ -166,7 +166,7 @@
 
 // COMPILER1 variant
 #ifdef COMPILER1
-#if defined(COMPILER2) || defined(GRAAL)
+#if defined(COMPILER2) || defined(COMPILERGRAAL)
   #define TIERED
 #endif
 #define COMPILER1_PRESENT(code) code
@@ -183,34 +183,32 @@
 #define NOT_COMPILER2(code) code
 #endif // COMPILER2
 
+#ifdef COMPILERGRAAL
+#define COMPILERGRAAL_PRESENT(code) code
+#define NOT_COMPILERGRAAL(code)
+#else // COMPILERGRAAL
+#define COMPILERGRAAL_PRESENT(code)
+#define NOT_COMPILERGRAAL(code) code
+#endif // COMPILERGRAAL
+
+#if defined(COMPILERGRAAL) && !defined(GRAAL)
+#error "COMPILERGRAAL needs GRAAL to be defined"
+#endif
+
 #ifdef GRAAL
 #define GRAAL_ONLY(code) code
 #define NOT_GRAAL(code)
 #define IS_GRAAL_DEFINED true
-#if !defined(COMPILER2)
-// Graal is the only compiler in the system and so will be used for compilation
-// requests issued by the compile broker.
-#define GRAALVM
-#define GRAALVM_ONLY(code) code
-#define NOT_GRAALVM(code)
-#else
-// Graal is not the only compiler in the system and so will only be used for
-// compilation requests issued via the Graal API
-#define GRAALVM_ONLY(code)
-#define NOT_GRAALVM(code) code
-#endif
-#else // !GRAAL
+#else // GRAAL
 #define GRAAL_ONLY(code)
 #define NOT_GRAAL(code) code
 #define IS_GRAAL_DEFINED false
-#define GRAALVM_ONLY(code)
-#define NOT_GRAALVM(code) code
 #endif // GRAAL
 
 #ifdef TIERED
 #define TIERED_ONLY(code) code
 #define NOT_TIERED(code)
-#else
+#else // TIERED
 #define TIERED_ONLY(code)
 #define NOT_TIERED(code) code
 #endif // TIERED