--- a/src/hotspot/cpu/x86/globals_x86.hpp Mon Nov 06 20:29:49 2017 -0800
+++ b/src/hotspot/cpu/x86/globals_x86.hpp Mon Nov 06 21:28:03 2017 -0800
@@ -46,11 +46,11 @@
// the the vep is aligned at CodeEntryAlignment whereas c2 only aligns
// the uep and the vep doesn't get real alignment but just slops on by
// only assured that the entry instruction meets the 5 byte size requirement.
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
define_pd_global(intx, CodeEntryAlignment, 32);
#else
define_pd_global(intx, CodeEntryAlignment, 16);
-#endif // COMPILER2
+#endif // COMPILER2_OR_JVMCI
define_pd_global(intx, OptoLoopAlignment, 16);
define_pd_global(intx, InlineFrequencyCount, 100);
define_pd_global(intx, InlineSmallCode, 1000);