--- old/src/cpu/x86/vm/stubGenerator_x86_32.cpp	2016-11-29 16:18:39.938729800 -0800
+++ new/src/cpu/x86/vm/stubGenerator_x86_32.cpp	2016-11-29 16:18:39.098729800 -0800
@@ -3857,7 +3857,7 @@
       StubRoutines::_crc32c_table_addr = (address)StubRoutines::x86::_crc32c_table;
       StubRoutines::_updateBytesCRC32C = generate_updateBytesCRC32C(supports_clmul);
     }
-    if (VM_Version::supports_sse2() && UseLibmIntrinsic) {
+    if (VM_Version::supports_sse2() && UseLibmIntrinsic && InlineIntrinsics) {
       if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin) ||
           vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos) ||
           vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtan)) {
--- old/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2016-11-29 16:18:45.234729800 -0800
+++ new/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2016-11-29 16:18:44.447729800 -0800
@@ -4965,7 +4965,7 @@
       StubRoutines::_crc32c_table_addr = (address)StubRoutines::x86::_crc32c_table;
       StubRoutines::_updateBytesCRC32C = generate_updateBytesCRC32C(supports_clmul);
     }
-    if (VM_Version::supports_sse2() && UseLibmIntrinsic) {
+    if (VM_Version::supports_sse2() && UseLibmIntrinsic && InlineIntrinsics) {
       if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin) ||
           vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos) ||
           vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtan)) {