*** old/src/share/vm/prims/nativeLookup.cpp	Tue Mar  1 08:23:14 2016
--- new/src/share/vm/prims/nativeLookup.cpp	Tue Mar  1 08:23:14 2016

*** 33,42 ****
--- 33,43 ----
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/symbol.hpp"
  #include "prims/jvm_misc.hpp"
  #include "prims/nativeLookup.hpp"
+ #include "prims/unsafe.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/javaCalls.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/signature.hpp"

*** 105,116 ****
--- 106,115 ----
    mangle_name_on(&st, signature, 1, end);
    return st.as_string();
  }
  
  extern "C" {
    void JNICALL JVM_RegisterJDKInternalMiscUnsafeMethods(JNIEnv *env, jclass unsafecls);
    void JNICALL JVM_RegisterSunMiscUnsafeMethods(JNIEnv *env, jclass unsafecls);
    void JNICALL JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass unsafecls);
    void JNICALL JVM_RegisterPerfMethods(JNIEnv *env, jclass perfclass);
    void JNICALL JVM_RegisterWhiteBoxMethods(JNIEnv *env, jclass wbclass);
  #if INCLUDE_JVMCI
    jobject  JNICALL JVM_GetJVMCIRuntime(JNIEnv *env, jclass c);

*** 121,131 ****
--- 120,129 ----
  #define CC (char*)  /* cast a literal from (const char*) */
  #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
  
  static JNINativeMethod lookup_special_native_methods[] = {
    { CC"Java_jdk_internal_misc_Unsafe_registerNatives",             NULL, FN_PTR(JVM_RegisterJDKInternalMiscUnsafeMethods) },
    { CC"Java_sun_misc_Unsafe_registerNatives",                      NULL, FN_PTR(JVM_RegisterSunMiscUnsafeMethods)         },
    { CC"Java_java_lang_invoke_MethodHandleNatives_registerNatives", NULL, FN_PTR(JVM_RegisterMethodHandleMethods) },
    { CC"Java_jdk_internal_perf_Perf_registerNatives",               NULL, FN_PTR(JVM_RegisterPerfMethods)         },
    { CC"Java_sun_hotspot_WhiteBox_registerNatives",                 NULL, FN_PTR(JVM_RegisterWhiteBoxMethods)     },
  #if INCLUDE_JVMCI
    { CC"Java_jdk_vm_ci_runtime_JVMCI_initializeRuntime",            NULL, FN_PTR(JVM_GetJVMCIRuntime)             },