Mercurial > hg > graal-compiler
changeset 4606:ad0440b099ff
Merge
author | Christian Haeubl <christian.haeubl@oracle.com> |
---|---|
date | Thu, 16 Feb 2012 16:32:14 -0800 |
parents | f0569f6336f7 (current diff) a1238d5c6991 (diff) |
children | ee87cfe2f8f9 7d928ba6f3f2 |
files | |
diffstat | 2 files changed, 17 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/commands.py Thu Feb 16 16:31:27 2012 -0800 +++ b/mx/commands.py Thu Feb 16 16:32:14 2012 -0800 @@ -612,12 +612,17 @@ mx.abort(codeOrMessage) return self + parser = ArgumentParser(prog='mx gate'); + parser.add_argument('--omit-native-build', action='store_false', dest='buildNative', help='omit cleaning and building native code') + + args = parser.parse_args(args) + tasks = [] total = Task('Gate') try: t = Task('Clean') - clean([]) + clean([] if args.buildNative else ['--no-native']) tasks.append(t.stop()) t = Task('Checkstyle') @@ -640,17 +645,19 @@ tasks.append(t.stop()) # Prevent Graal modifications from breaking the standard builds - t = Task('BuildHotSpotVarieties') - buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product']) - tasks.append(t.stop()) + if args.buildNative: + t = Task('BuildHotSpotVarieties') + buildvms(['--vms', 'client,server', '--builds', 'fastdebug,product']) + tasks.append(t.stop()) for vmbuild in ['fastdebug', 'product']: global _vmbuild _vmbuild = vmbuild - t = Task('BuildHotSpotGraal:' + vmbuild) - buildvms(['--vms', 'graal', '--builds', vmbuild]) - tasks.append(t.stop()) + if args.buildNative: + t = Task('BuildHotSpotGraal:' + vmbuild) + buildvms(['--vms', 'graal', '--builds', vmbuild]) + tasks.append(t.stop()) t = Task('BootstrapWithSystemAssertions:' + vmbuild) vm(['-esa', '-version']) @@ -795,7 +802,7 @@ _vmbuild = 'product' commands = { 'build': [build, '[-options]'], - 'buildvms': [buildvms, ''], + 'buildvms': [buildvms, '[-options]'], 'clean': [clean, ''], 'copyrightcheck': [copyrightcheck, ''], 'hsdis': [hsdis, '[att]'], @@ -803,7 +810,7 @@ 'scaladacapo': [scaladacapo, '[[n] benchmark] [VM options|@Scala DaCapo options]'], 'specjvm2008': [specjvm2008, '[VM options|@specjvm2008 options]'], 'example': [example, '[-v] example names...'], - 'gate' : [gate, ''], + 'gate' : [gate, '[-options]'], 'gv' : [gv, ''], 'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'], 'unittest' : [unittest, '[filters...]'],
--- a/src/share/vm/graal/graalEnv.cpp Thu Feb 16 16:31:27 2012 -0800 +++ b/src/share/vm/graal/graalEnv.cpp Thu Feb 16 16:32:14 2012 -0800 @@ -246,7 +246,7 @@ int index) { EXCEPTION_CONTEXT; - assert(klass->is_linked(), "must be linked before using its constan-pool"); + assert(klass->is_linked(), "must be linked before using its constant-pool"); constantPoolHandle cpool(thread, klass->constants());