--- old/src/share/vm/prims/jvm.cpp	2016-04-14 00:23:56.944573561 +0900
+++ new/src/share/vm/prims/jvm.cpp	2016-04-14 00:23:56.770574323 +0900
@@ -3180,6 +3180,11 @@
   }
 JVM_END
 
+JVM_ENTRY_NO_ENV(void, JVM_SetNativeThreadName0(const char *name))
+  JVMWrapper("JVM_SetNativeThreadName0");
+  os::set_native_thread_name(name);
+JVM_END
+
 JVM_ENTRY(void, JVM_SetNativeThreadName(JNIEnv* env, jobject jthread, jstring name))
   JVMWrapper("JVM_SetNativeThreadName");
   ResourceMark rm(THREAD);
@@ -3191,7 +3196,7 @@
     // we don't set the name of an attached thread to avoid stepping
     // on other programs
     const char *thread_name = java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(name));
-    os::set_native_thread_name(thread_name);
+    JVM_SetNativeThreadName0(thread_name);
   }
 JVM_END