--- old/src/share/vm/runtime/interfaceSupport.hpp	2015-11-11 15:13:59.556161137 -0500
+++ new/src/share/vm/runtime/interfaceSupport.hpp	2015-11-11 15:13:57.764059660 -0500
@@ -567,7 +567,7 @@
 #define JVM_ENTRY_NO_ENV(result_type, header)                        \
 extern "C" {                                                         \
   result_type JNICALL header {                                       \
-    JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();  \
+    JavaThread* thread = JavaThread::current();                      \
     ThreadInVMfromNative __tiv(thread);                              \
     debug_only(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)