Mercurial > hg > truffle

changeset 21580:a004616f72e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added support for '--vm graal' to mx as an alias for '--vm jvmci'
author Doug Simon <doug.simon@oracle.com>
date Fri, 29 May 2015 09:08:21 +0200
parents 6fffb62ccb32
children 03974616babf 453284d62d64
files mx/mx_graal.py
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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