--- a/hotspot/src/share/vm/utilities/macros.hpp	Sun Dec 11 12:05:57 2016 -0800
+++ b/hotspot/src/share/vm/utilities/macros.hpp	Sun Dec 11 19:07:04 2016 -0800
@@ -180,6 +180,14 @@
 #define INCLUDE_JVMCI 1
 #endif
 
+#ifdef INCLUDE_AOT
+# if INCLUDE_AOT && !(INCLUDE_JVMCI)
+#   error "Must have JVMCI for AOT"
+# endif
+#else
+# define INCLUDE_AOT 0
+#endif
+
 #if INCLUDE_JVMCI
 #define JVMCI_ONLY(code) code
 #define NOT_JVMCI(code)
@@ -190,6 +198,16 @@
 #define NOT_JVMCI_RETURN {}
 #endif // INCLUDE_JVMCI
 
+#if INCLUDE_AOT
+#define AOT_ONLY(code) code
+#define NOT_AOT(code)
+#define NOT_AOT_RETURN /* next token must be ; */
+#else
+#define AOT_ONLY(code)
+#define NOT_AOT(code) code
+#define NOT_AOT_RETURN {}
+#endif // INCLUDE_AOT
+
 // COMPILER1 variant
 #ifdef COMPILER1
 #ifdef COMPILER2