diff -r 89b942323bd1 -r c59f1676d27e hotspot/src/cpu/x86/vm/globals_x86.hpp
--- a/hotspot/src/cpu/x86/vm/globals_x86.hpp	Thu Oct 08 10:25:45 2015 +0000
+++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp	Thu Oct 08 12:49:30 2015 -1000
@@ -46,7 +46,7 @@
 // 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.
-#ifdef COMPILER2
+#if defined(COMPILER2) || INCLUDE_JVMCI
 define_pd_global(intx, CodeEntryAlignment,       32);
 #else
 define_pd_global(intx, CodeEntryAlignment,       16);