--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp	Sat Sep 30 01:38:57 2017 +0000
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp	Mon Oct 02 17:20:14 2017 +0300
@@ -340,6 +340,14 @@
     UseMultiplyToLenIntrinsic = true;
   }
 
+  if (FLAG_IS_DEFAULT(UseSquareToLenIntrinsic)) {
+    UseSquareToLenIntrinsic = true;
+  }
+
+  if (FLAG_IS_DEFAULT(UseMulAddIntrinsic)) {
+    UseMulAddIntrinsic = true;
+  }
+
   if (FLAG_IS_DEFAULT(UseBarriersForVolatile)) {
     UseBarriersForVolatile = (_features & CPU_DMB_ATOMICS) != 0;
   }