--- a/hotspot/src/cpu/aarch64/vm/register_aarch64.hpp	Wed May 27 09:02:08 2015 +0000
+++ b/hotspot/src/cpu/aarch64/vm/register_aarch64.hpp	Thu Jun 04 12:04:18 2015 +0000
@@ -186,7 +186,7 @@
   // it's optoregs.
 
     number_of_registers = (2 * RegisterImpl::number_of_registers +
-                           2 * FloatRegisterImpl::number_of_registers +
+                           4 * FloatRegisterImpl::number_of_registers +
                            1) // flags
   };