Mercurial > hg > graal-compiler
changeset 3578:1d3f67399c30
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 13 Sep 2011 20:34:37 +0200 |
parents | 96c40b338c1a (current diff) 37daba6a4e5a (diff) |
children | 5a4295ccaaea |
files | |
diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/runeclipse.sh Tue Sep 13 19:59:10 2011 +0200 +++ b/runeclipse.sh Tue Sep 13 20:34:37 2011 +0200 @@ -4,15 +4,15 @@ exit 1; fi if [ -z "${MAXINE}" ]; then - echo "MAXINE is not defined. It must point to a maxine repository directory." + echo "MAXINE is not defined. It must point to a Maxine repository directory." exit 1; fi if [ -z "${GRAAL}" ]; then - echo "GRAAL is not defined. It must point to a maxine repository directory." + echo "GRAAL is not defined. It must point to a Maxine repository directory." exit 1; fi -if [ -z "${DACAPO}" ]; then - echo "DACAPO is not defined. It must point to a Dacapo benchmark directory." +if [ ! -f "${DACAPO}/dacapo-9.12-bach.jar" ]; then + echo "DACAPO must point to a directory containing dacapo-9.12-bach.jar" exit 1; fi COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 15 eclipse"
--- a/src/share/vm/runtime/arguments.cpp Tue Sep 13 19:59:10 2011 +0200 +++ b/src/share/vm/runtime/arguments.cpp Tue Sep 13 20:34:37 2011 +0200 @@ -2030,6 +2030,8 @@ SysClassPath scp_compiler(Arguments::get_sysclasspath()); sprintf(temp, "%s/com.oracle.max.cri/bin", maxine_dir); scp_compiler.add_prefix(temp); + sprintf(temp, "%s/com.oracle.max.criutils/bin", maxine_dir); + scp_compiler.add_prefix(temp); sprintf(temp, "%s/com.oracle.max.base/bin", maxine_dir); scp_compiler.add_prefix(temp); sprintf(temp, "%s/com.oracle.max.asmdis/bin", maxine_dir);