--- a/hotspot/src/cpu/arm/vm/sharedRuntime_arm.cpp	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/cpu/arm/vm/sharedRuntime_arm.cpp	Thu Apr 13 09:57:51 2017 +0200
@@ -747,7 +747,7 @@
   assert_different_registers(tmp, R0, R1, R2, R3, R4, R5, R6, R7, Rsender_sp, Rparams);
 
   if (comp_args_on_stack) {
-    __ sub_slow(SP, SP, round_to(comp_args_on_stack * VMRegImpl::stack_slot_size, StackAlignmentInBytes));
+    __ sub_slow(SP, SP, align_up(comp_args_on_stack * VMRegImpl::stack_slot_size, StackAlignmentInBytes));
   }
 
   for (int i = 0; i < total_args_passed; i++) {
@@ -870,7 +870,7 @@
 
 #ifdef AARCH64
 
-  int extraspace = round_to(total_args_passed * Interpreter::stackElementSize, StackAlignmentInBytes);
+  int extraspace = align_up(total_args_passed * Interpreter::stackElementSize, StackAlignmentInBytes);
   if (extraspace) {
     __ sub(SP, SP, extraspace);
   }
@@ -1181,7 +1181,7 @@
   stack_slots += 2 * VMRegImpl::slots_per_word;
 
   // Calculate the final stack size taking account of alignment
-  stack_slots = round_to(stack_slots, StackAlignmentInBytes / VMRegImpl::stack_slot_size);
+  stack_slots = align_up(stack_slots, StackAlignmentInBytes / VMRegImpl::stack_slot_size);
   int stack_size = stack_slots * VMRegImpl::stack_slot_size;
   int lock_slot_fp_offset = stack_size - 2 * wordSize -
     lock_slot_offset * VMRegImpl::stack_slot_size;
@@ -1851,7 +1851,7 @@
 int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals) {
   int extra_locals_size = (callee_locals - callee_parameters) * Interpreter::stackElementWords;
 #ifdef AARCH64
-  extra_locals_size = round_to(extra_locals_size, StackAlignmentInBytes/BytesPerWord);
+  extra_locals_size = align_up(extra_locals_size, StackAlignmentInBytes/BytesPerWord);
 #endif // AARCH64
   return extra_locals_size;
 }