# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1426257503 -3600
# Node ID 79d5fbcc6978e13830c580f52344ae9e83ea0953
# Parent  79682c7f2ec7b18f56728c8e40b6f8ae9123469a# Parent  97da0b90e0f3021d35138e6596c66e0e7a5ced74
Merge.

diff -r 79682c7f2ec7 -r 79d5fbcc6978 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Fri Mar 13 12:27:07 2015 +0100
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Fri Mar 13 15:38:23 2015 +0100
@@ -333,7 +333,7 @@
                 return new AMD64RawNativeCallNode(returnType, functionPointer, args);
             }
         };
-        Backend backend = HotSpotGraalRuntime.runtime().getBackend(AMD64.class);
+        Backend backend = HotSpotGraalRuntime.runtime().getHostBackend();
         return new HotSpotNativeFunctionInterface(HotSpotGraalRuntime.runtime().getHostProviders(), factory, backend, config.dllLoad, config.dllLookup, config.rtldDefault);
     }
 
diff -r 79682c7f2ec7 -r 79d5fbcc6978 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionInterface.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionInterface.java	Fri Mar 13 12:27:07 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionInterface.java	Fri Mar 13 15:38:23 2015 +0100
@@ -57,6 +57,7 @@
     public HotSpotNativeFunctionInterface(HotSpotProviders providers, RawNativeCallNodeFactory factory, Backend backend, long dlopen, long dlsym, long rtldDefault) {
         this.rtldDefault = rtldDefault == HotSpotVMConfig.INVALID_RTLD_DEFAULT_HANDLE ? null : new HotSpotNativeLibraryHandle("RTLD_DEFAULT", rtldDefault);
         this.providers = providers;
+        assert backend != null;
         this.backend = backend;
         this.factory = factory;
         this.libraryLoadFunctionPointer = new HotSpotNativeFunctionPointer(dlopen, "os::dll_load");