Merge
authoriignatyev
Thu, 29 Oct 2015 19:30:51 +0000
changeset 33487 cf40d414392a
parent 33485 29d1dfa9bb4a (diff)
parent 33486 fe33cd4bc70e (current diff)
child 33488 4502777fc2fc
Merge
--- a/hotspot/src/share/vm/runtime/stubRoutines.cpp	Thu Oct 29 21:31:47 2015 +0300
+++ b/hotspot/src/share/vm/runtime/stubRoutines.cpp	Thu Oct 29 19:30:51 2015 +0000
@@ -151,7 +151,6 @@
 address StubRoutines::_dexp = NULL;
 address StubRoutines::_dlog = NULL;
 
-double (* StubRoutines::_intrinsic_log   )(double) = NULL;
 double (* StubRoutines::_intrinsic_log10 )(double) = NULL;
 double (* StubRoutines::_intrinsic_pow   )(double, double) = NULL;
 double (* StubRoutines::_intrinsic_sin   )(double) = NULL;
--- a/hotspot/src/share/vm/runtime/stubRoutines.hpp	Thu Oct 29 21:31:47 2015 +0300
+++ b/hotspot/src/share/vm/runtime/stubRoutines.hpp	Thu Oct 29 19:30:51 2015 +0000
@@ -216,7 +216,6 @@
   // intrinsic version returns the same result as the strict version
   // then they can be set to the appropriate function from
   // SharedRuntime.
-  static double (*_intrinsic_log)(double);
   static double (*_intrinsic_log10)(double);
   static double (*_intrinsic_pow)(double, double);
   static double (*_intrinsic_sin)(double);
@@ -384,12 +383,8 @@
 
   static address zero_aligned_words()   { return _zero_aligned_words; }
 
-  static double  intrinsic_log(double d) {
-    assert(_intrinsic_log != NULL, "must be defined");
-    return _intrinsic_log(d);
-  }
   static double  intrinsic_log10(double d) {
-    assert(_intrinsic_log != NULL, "must be defined");
+    assert(_intrinsic_log10 != NULL, "must be defined");
     return _intrinsic_log10(d);
   }
   static double  intrinsic_pow(double d, double d2) {