# HG changeset patch
# User roland
# Date 1444742622 0
# Node ID 1019481697e47ff084a2f991b5162469c2311440
# Parent  25ea04039ff9df33ec5cd1401a552d9d576e4467# Parent  06453a29bc41e1123613d2b022229eb84a017094
Merge

diff -r 25ea04039ff9 -r 1019481697e4 hotspot/src/share/vm/opto/library_call.cpp
--- a/hotspot/src/share/vm/opto/library_call.cpp	Tue Oct 13 10:09:57 2015 +0200
+++ b/hotspot/src/share/vm/opto/library_call.cpp	Tue Oct 13 13:23:42 2015 +0000
@@ -1762,8 +1762,9 @@
   case vmIntrinsics::_dabs:   return Matcher::has_match_rule(Op_AbsD)   ? inline_math(id) : false;
 
   case vmIntrinsics::_dexp:
-    return (UseSSE >= 2) ? runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dexp(),  "dexp") :
-    runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dexp),  "EXP");
+    return StubRoutines::dexp() != NULL ?
+      runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dexp(),  "dexp") :
+      runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dexp),  "EXP");
   case vmIntrinsics::_dpow:   return Matcher::has_match_rule(Op_PowD)   ? inline_pow()    :
     runtime_math(OptoRuntime::Math_DD_D_Type(), FN_PTR(SharedRuntime::dpow),  "POW");
 #undef FN_PTR