Mercurial > hg > graal-compiler
changeset 13926:6be4edba54ba
Merge
author | Mick Jordan <mick.jordan@oracle.com> |
---|---|
date | Tue, 11 Feb 2014 08:47:18 -0800 |
parents | 94bd8c6c9d38 (current diff) d766ec8ce4b1 (diff) |
children | 91699ee4e4fa f191cac04605 |
files | |
diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotLIRGenerator.java Tue Feb 11 08:42:57 2014 -0800 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotLIRGenerator.java Tue Feb 11 08:47:18 2014 -0800 @@ -44,12 +44,9 @@ */ public class PTXHotSpotLIRGenerator extends PTXLIRGenerator implements HotSpotLIRGenerator { - private final HotSpotVMConfig config; - protected PTXHotSpotLIRGenerator(StructuredGraph graph, HotSpotProviders providers, HotSpotVMConfig config, FrameMap frameMap, CallingConvention cc, LIR lir) { super(graph, providers, frameMap, cc, lir); assert config.basicLockSize == 8; - this.config = config; } public void emitPrefetchAllocate(ValueNode address, ValueNode distance) { @@ -80,6 +77,7 @@ throw GraalInternalError.unimplemented(); } + @Override public HotSpotProviders getProviders() { throw GraalInternalError.unimplemented(); }
--- a/mxtool/mx.py Tue Feb 11 08:42:57 2014 -0800 +++ b/mxtool/mx.py Tue Feb 11 08:47:18 2014 -0800 @@ -1567,11 +1567,15 @@ jdtJar = None if args.jdt is not None: - if args.jdt.endswith('.jar'): - jdtJar = args.jdt - if not exists(jdtJar) and os.path.abspath(jdtJar) == os.path.abspath(defaultEcjPath) and get_env('JDT', None) is None: - # Silently ignore JDT if default location is used but not ecj.jar exists there + if not args.jdt.endswith('.jar'): + abort('Path for Eclipse batch compiler does not look like a jar file: ' + args.jdt) + jdtJar = args.jdt + if not exists(jdtJar): + if os.path.abspath(jdtJar) == os.path.abspath(defaultEcjPath) and get_env('JDT', None) is None: + # Silently ignore JDT if default location is used but does not exist jdtJar = None + else: + abort('Eclipse batch compiler jar does not exist: ' + args.jdt) built = set()