--- old/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2021-01-11 15:16:51.612831075 -0500
+++ new/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2021-01-11 15:16:51.530830795 -0500
@@ -4270,8 +4270,9 @@
     if (UseMulAddIntrinsic) {
       StubRoutines::_mulAdd = generate_mulAdd();
     }
-
-#ifndef _WINDOWS
+    
+// Visual Studio 2017 (and higher) has the compiler instrinisics required
+#if !(defined(_WINDOWS) && _MSC_VER < 1910)
     if (UseMontgomeryMultiplyIntrinsic) {
       StubRoutines::_montgomeryMultiply
         = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_multiply);
@@ -4280,7 +4281,7 @@
       StubRoutines::_montgomerySquare
         = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_square);
     }
-#endif // WINDOWS
+    #endif //! VC++ < 2017
 #endif // COMPILER2
   }