# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1360160345 -3600
# Node ID 07367ef2cb455a2e820f2dddefbd30eb00a5f294
# Parent  77de316e40a4a2c5ca48f16828a406a53d7957fa# Parent  f6bf0f6a84312b9e3767d9a5fedf140282018b4c
Merge.

diff -r 77de316e40a4 -r 07367ef2cb45 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRuntime.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRuntime.java	Wed Feb 06 14:26:47 2013 +0100
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRuntime.java	Wed Feb 06 15:19:05 2013 +0100
@@ -195,9 +195,4 @@
     protected RegisterConfig createRegisterConfig(boolean globalStubConfig) {
         return new AMD64HotSpotRegisterConfig(config, globalStubConfig);
     }
-
-    @Override
-    public TargetDescription getTarget() {
-        return graalRuntime.getTarget();
-    }
 }
diff -r 77de316e40a4 -r 07367ef2cb45 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java	Wed Feb 06 14:26:47 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java	Wed Feb 06 15:19:05 2013 +0100
@@ -943,4 +943,9 @@
                 throw GraalInternalError.shouldNotReachHere();
         }
     }
+
+    @Override
+    public TargetDescription getTarget() {
+        return graalRuntime.getTarget();
+    }
 }