diff -r 3de78115ecd5 -r a4cf2927e727 hotspot/src/share/vm/runtime/sharedRuntime.cpp
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Thu Dec 10 17:03:48 2015 +0100
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Thu Dec 10 09:42:22 2015 -0800
@@ -254,8 +254,10 @@
        ((ybits.i & float_sign_mask) == float_infinity) ) {
     return x;
   }
+  return ((jfloat)fmod_winx64((double)x, (double)y));
+#else
+  return ((jfloat)fmod((double)x,(double)y));
 #endif
-  return ((jfloat)fmod((double)x,(double)y));
 JRT_END
 
 
@@ -269,8 +271,10 @@
        ((ybits.l & double_sign_mask) == double_infinity) ) {
     return x;
   }
+  return ((jdouble)fmod_winx64((double)x, (double)y));
+#else
+  return ((jdouble)fmod((double)x,(double)y));
 #endif
-  return ((jdouble)fmod((double)x,(double)y));
 JRT_END
 
 #ifdef __SOFTFP__