--- old/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp	2016-05-18 14:04:04.567118400 -0700
+++ new/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp	2016-05-18 14:04:04.173118400 -0700
@@ -350,7 +350,7 @@
         if (VM_Version::supports_sse2() && StubRoutines::dsin() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dsin())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dsin)));
+          __ mathfunc(CAST_FROM_FN_PTR(address, SharedRuntime::dsin));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -360,7 +360,7 @@
         if (VM_Version::supports_sse2() && StubRoutines::dcos() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dcos())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dcos)));
+          __ mathfunc(CAST_FROM_FN_PTR(address, SharedRuntime::dcos));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -370,7 +370,7 @@
         if (StubRoutines::dtan() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dtan())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dtan)));
+          __ mathfunc(CAST_FROM_FN_PTR(address, SharedRuntime::dtan));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -386,7 +386,7 @@
         if (StubRoutines::dlog() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlog())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dlog)));
+          __ mathfunc(CAST_FROM_FN_PTR(address, SharedRuntime::dlog));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -396,7 +396,7 @@
         if (StubRoutines::dlog10() != NULL) {
           __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlog10())));
         } else {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dlog10)));
+          __ mathfunc(CAST_FROM_FN_PTR(address, SharedRuntime::dlog10));
         }
         __ addptr(rsp, 2 * wordSize);
         break;
@@ -408,7 +408,7 @@
       if (StubRoutines::dpow() != NULL) {
         __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dpow())));
       } else {
-        __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dpow)));
+        __ mathfunc(CAST_FROM_FN_PTR(address, SharedRuntime::dpow));
       }
       __ addptr(rsp, 4 * wordSize);
       break;
@@ -418,7 +418,7 @@
       if (StubRoutines::dexp() != NULL) {
         __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dexp())));
       } else {
-        __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dexp)));
+        __ mathfunc(CAST_FROM_FN_PTR(address, SharedRuntime::dexp));
       }
       __ addptr(rsp, 2*wordSize);
     break;