Mercurial > hg > graal-compiler
changeset 22503:c74d7f8a8ee6
Use Java based CTW command
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Mon, 24 Aug 2015 23:50:37 -0700 |
| parents | fc47a1b49528 |
| children | 35bc891eb21c |
| files | mx.graal/mx_graal.py mx.graal/suite.py |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.graal/mx_graal.py Mon Aug 24 23:07:36 2015 +0200 +++ b/mx.graal/mx_graal.py Mon Aug 24 23:50:37 2015 -0700 @@ -200,17 +200,16 @@ jar = join(get_jvmci_jdk(installJars=False), 'jre', 'lib', 'rt.jar') vmargs.append('-G:CompileTheWorldExcludeMethodFilter=sun.awt.X11.*.*') - vmargs += ['-XX:+CompileTheWorld'] + # suppress menubar and dock when running on Mac; exclude x11 classes as they may cause vm crashes (on Solaris) + vmargs = ['-Djava.awt.headless=true'] + vmargs + vm_ = get_vm() if isJVMCIEnabled(vm_): if vm_ == 'jvmci': vmargs += ['-XX:+BootstrapJVMCI'] - vmargs += ['-G:CompileTheWorldClasspath=' + jar] + vmargs += ['-G:CompileTheWorldClasspath=' + jar, '-XX:-UseJVMCIClassLoader', 'jdk.internal.jvmci.hotspot.CompileTheWorldMain'] else: - vmargs += ['-Xbootclasspath/p:' + jar] - - # suppress menubar and dock when running on Mac; exclude x11 classes as they may cause vm crashes (on Solaris) - vmargs = ['-Djava.awt.headless=true'] + vmargs + vmargs += ['-XX:+CompileTheWorld', '-Xbootclasspath/p:' + jar] vm(vmargs)
--- a/mx.graal/suite.py Mon Aug 24 23:07:36 2015 +0200 +++ b/mx.graal/suite.py Mon Aug 24 23:50:37 2015 -0700 @@ -6,7 +6,7 @@ "suites": [ { "name" : "jvmci", - "version" : "f27c163d7dc2de3a1e1f8949a33c8a46d9e8ecf4", + "version" : "d9f5c93a83d36e8e624f2ba30f054237db50876d", "urls" : [ {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"}, {"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"},