Mercurial > hg > truffle

changeset 16717:91e7d77cfb81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NFI: initialization only if platform is x86
author Matthias Grimmer <grimmer@ssw.jku.at>
date Thu, 07 Aug 2014 08:04:23 +0200
parents bb030c4a6822
children 4703a9442f3f ad19df13df14
files src/share/vm/graal/graalRuntime.cpp
diffstat 1 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/graal/graalRuntime.cpp	Wed Aug 06 17:49:04 2014 +0200
+++ b/src/share/vm/graal/graalRuntime.cpp	Thu Aug 07 08:04:23 2014 +0200
@@ -666,7 +666,17 @@
 
 // private static NativeFunctionInterfaceRuntime.createInterface()
 JVM_ENTRY(jobject, JVM_CreateNativeFunctionInterface(JNIEnv *env, jclass c))
-  TempNewSymbol name = SymbolTable::new_symbol("com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend", CHECK_NULL);
+  const char* backendName = NULL;
+  #ifdef TARGET_ARCH_x86
+  #ifdef _LP64
+    backendName = "com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend";
+  #endif 
+  #endif
+
+  if (backendName == NULL) {
+    return NULL;
+  }
+  TempNewSymbol name = SymbolTable::new_symbol(backendName, CHECK_NULL);
   KlassHandle klass = GraalRuntime::resolve_or_fail(name, CHECK_NULL);
 
   TempNewSymbol makeInstance = SymbolTable::new_symbol("createNativeFunctionInterface", CHECK_NULL);