*** old/src/share/vm/utilities/macros.hpp	Mon Oct 31 17:47:15 2016
--- new/src/share/vm/utilities/macros.hpp	Mon Oct 31 17:47:14 2016

*** 178,197 ****
--- 178,215 ----
  
  #ifndef INCLUDE_JVMCI
  #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)
  #define NOT_JVMCI_RETURN /* next token must be ; */
  #else
  #define JVMCI_ONLY(code)
  #define NOT_JVMCI(code) code
  #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
    #define TIERED
  #endif