diff -r a3919f5e8d2b -r 750c6edff33b hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
--- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	Thu Apr 13 09:57:51 2017 +0200
@@ -290,7 +290,7 @@
   // very hard to make a guess about what code might be in the icache.
   // Force the instruction to be double word aligned so that it
   // doesn't span a cache line.
-  masm->align(round_to(NativeGeneralJump::instruction_size, wordSize));
+  masm->align(align_up((int)NativeGeneralJump::instruction_size, wordSize));
 }
 
 void PatchingStub::emit_code(LIR_Assembler* ce) {