Mercurial > hg > graal-compiler

diff src/share/vm/graal/graalRuntime.cpp @ 20872:b1700db197c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move com.oracle.nfi implementation to graal.truffle.hotspot since it implements an interface that does not live in the graal class-loader
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Thu, 09 Apr 2015 17:40:55 +0200
parents 7366593c0610
children 23433619a7cd
line wrap: on
line diff
--- a/src/share/vm/graal/graalRuntime.cpp	Thu Apr 09 17:50:15 2015 +0200
+++ b/src/share/vm/graal/graalRuntime.cpp	Thu Apr 09 17:40:55 2015 +0200
@@ -652,18 +652,8 @@
 
 // private static NativeFunctionInterfaceRuntime.createInterface()
 JVM_ENTRY(jobject, JVM_CreateNativeFunctionInterface(JNIEnv *env, jclass c))
-  const char* backendName = NULL;
-  #ifdef TARGET_ARCH_x86
-  #ifdef _LP64
-    backendName = "com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend";
-  #endif
-  #endif
-
-  if (backendName == NULL) {
-    return NULL;
-  }
   GraalRuntime::ensure_graal_class_loader_is_initialized();
-  TempNewSymbol name = SymbolTable::new_symbol(backendName, CHECK_NULL);
+  TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime", CHECK_NULL);
   KlassHandle klass = GraalRuntime::resolve_or_fail(name, CHECK_NULL);
 
   TempNewSymbol makeInstance = SymbolTable::new_symbol("createNativeFunctionInterface", CHECK_NULL);