# HG changeset patch # User Doug Simon # Date 1432883301 -7200 # Node ID a004616f72e5e720a9231c50d1c1ad8802f19d8d # Parent 6fffb62ccb328c23a07dabd9d5ee0138da9984a1 added support for '--vm graal' to mx as an alias for '--vm jvmci' diff -r 6fffb62ccb32 -r a004616f72e5 mx/mx_graal.py --- a/mx/mx_graal.py Thu May 28 21:14:08 2015 -0700 +++ b/mx/mx_graal.py Fri May 29 09:08:21 2015 +0200 @@ -53,6 +53,7 @@ 'server-nojvmci' : None, # all compilation with tiered system (i.e., client + server), JVMCI omitted 'client-nojvmci' : None, # all compilation with client compiler, JVMCI omitted 'original' : None, # default VM copied from bootstrap JDK + 'graal' : 'Alias for jvmci', } """ The VM that will be run by the 'vm' command and built by default by the 'build' command. @@ -1094,6 +1095,9 @@ f.write(line) if not found: f.write(vmKnown) + if vm == 'jvmci': + # Legacy support + f.write('-graal ALIASED_TO -jvmci\n') if exists(timestampFile): os.utime(timestampFile, None) @@ -2670,6 +2674,8 @@ if hasattr(opts, 'vm') and opts.vm is not None: global _vm _vm = opts.vm + if _vm == 'graal': + _vm = 'jvmci' if hasattr(opts, 'vmbuild') and opts.vmbuild is not None: global _vmbuild _vmbuild = opts.vmbuild