Mercurial > hg > truffle
changeset 7737:07367ef2cb45
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Wed, 06 Feb 2013 15:19:05 +0100 |
parents | 77de316e40a4 (current diff) f6bf0f6a8431 (diff) |
children | 6a78ed71be90 |
files | |
diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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(); - } }
--- 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(); + } }