Mercurial > hg > graal-jvmci-8
diff src/share/vm/prims/nativeLookup.cpp @ 21562:47bebae7454f
Merge.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 28 May 2015 21:58:33 +0200 |
| parents | be896a1983c0 cecb4e39521c |
| children | 4f63449b4422 |
line wrap: on
line diff
--- a/src/share/vm/prims/nativeLookup.cpp Thu May 28 17:13:22 2015 +0200 +++ b/src/share/vm/prims/nativeLookup.cpp Thu May 28 21:58:33 2015 +0200 @@ -134,7 +134,7 @@ jobject JNICALL JVM_GetJVMCIServiceImpls(JNIEnv *env, jclass c, jclass serviceClass); jobject JNICALL JVM_CreateTruffleRuntime(JNIEnv *env, jclass c); jobject JNICALL JVM_CreateNativeFunctionInterface(JNIEnv *env, jclass c); - jboolean JNICALL JVM_ParseJVMCIOptions(JNIEnv *env, jclass hotspotOptionsClass); + jboolean JNICALL JVM_IsCITimingEnabled(JNIEnv *env); #ifdef COMPILERJVMCI void JNICALL JVM_PrintAndResetJVMCICompRate(JNIEnv *env, jclass c); #endif @@ -156,7 +156,7 @@ { CC"Java_com_oracle_truffle_api_Truffle_createRuntime", NULL, FN_PTR(JVM_CreateTruffleRuntime) }, { CC"Java_com_oracle_nfi_NativeFunctionInterfaceRuntime_createInterface", NULL, FN_PTR(JVM_CreateNativeFunctionInterface) }, { CC"Java_com_oracle_jvmci_hotspot_CompilerToVMImpl_init", NULL, FN_PTR(JVM_InitializeJVMCINatives) }, - { CC"Java_com_oracle_jvmci_hotspot_HotSpotOptions_parseVMOptions", NULL, FN_PTR(JVM_ParseJVMCIOptions) }, + { CC"Java_com_oracle_jvmci_hotspot_HotSpotOptions_isCITimingEnabled", NULL, FN_PTR(JVM_IsCITimingEnabled) }, #endif };