hg: jdk/hs: 8152470: Add COMPILER2_OR_JVMCI definition

[jamsheed.c.m at oracle.com]

Changeset: 1772ebf07d1f
Author:    jcm
Date:      2017-11-06 21:28 -0800
URL:       http://hg.openjdk.java.net/jdk/hs/rev/1772ebf07d1f

8152470: Add COMPILER2_OR_JVMCI definition
Summary: defined(COMPILER2) || INCLUDE_JVMCI changed replaced with COMPILER2_OR_JVMCI
Reviewed-by: kvn

! src/hotspot/cpu/aarch64/frame_aarch64.cpp
! src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
! src/hotspot/cpu/arm/compiledIC_arm.cpp
! src/hotspot/cpu/x86/frame_x86.cpp
! src/hotspot/cpu/x86/globals_x86.hpp
! src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
! src/hotspot/cpu/x86/vm_version_x86.cpp
! src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.cpp
! src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp
! src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp
! src/hotspot/share/code/scopeDesc.cpp
! src/hotspot/share/compiler/oopMap.cpp
! src/hotspot/share/compiler/oopMap.hpp
! src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.cpp
! src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
! src/hotspot/share/gc/g1/g1MarkSweep.cpp
! src/hotspot/share/gc/parallel/psMarkSweep.cpp
! src/hotspot/share/gc/parallel/psParallelCompact.cpp
! src/hotspot/share/gc/parallel/psScavenge.cpp
! src/hotspot/share/gc/serial/genMarkSweep.cpp
! src/hotspot/share/gc/shared/collectedHeap.cpp
! src/hotspot/share/gc/shared/genCollectedHeap.cpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/oops/methodCounters.hpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/deoptimization.cpp
! src/hotspot/share/runtime/deoptimization.hpp
! src/hotspot/share/runtime/frame.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/rframe.cpp
! src/hotspot/share/runtime/sharedRuntime.cpp
! src/hotspot/share/runtime/thread.cpp