--- a/hotspot/src/cpu/s390/vm/c1_CodeStubs_s390.cpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/cpu/s390/vm/c1_CodeStubs_s390.cpp	Thu Apr 13 09:57:51 2017 +0200
@@ -284,7 +284,7 @@
   masm->block_comment(bc);
 #endif
 
-  masm->align(round_to(NativeGeneralJump::instruction_size, wordSize));
+  masm->align(align_up((int)NativeGeneralJump::instruction_size, wordSize));
 }
 
 void PatchingStub::emit_code(LIR_Assembler* ce) {