--- old/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2016-02-19 17:13:58.086649785 +0300
+++ new/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2016-02-19 17:13:57.981647049 +0300
@@ -4094,7 +4094,18 @@
     if (UseMulAddIntrinsic) {
       StubRoutines::_mulAdd = generate_mulAdd();
     }
-#endif
+
+#ifndef _WINDOWS
+    if (UseMontgomeryMultiplyIntrinsic) {
+      StubRoutines::_montgomeryMultiply
+        = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_multiply);
+    }
+    if (UseMontgomerySquareIntrinsic) {
+      StubRoutines::_montgomerySquare
+        = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_square);
+    }
+#endif // WINDOWS
+#endif // COMPILER2
   }
 
  public: