src/share/vm/utilities/macros.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 204,213 ****
--- 204,222 ----
  #else // COMPILER2
  #define COMPILER2_PRESENT(code)
  #define NOT_COMPILER2(code) code
  #endif // COMPILER2
  
+ // COMPILER2 or JVMCI
+ #if defined(COMPILER2) || INCLUDE_JVMCI
+ #define COMPILER2_OR_JVMCI_PRESENT(code) code
+ #define NOT_COMPILER2_OR_JVMCI(code)
+ #else
+ #define COMPILER2_OR_JVMCI_PRESENT(code)
+ #define NOT_COMPILER2_OR_JVMCI(code) code
+ #endif
+ 
  #ifdef TIERED
  #define TIERED_ONLY(code) code
  #define NOT_TIERED(code)
  #else // TIERED
  #define TIERED_ONLY(code)