Mercurial > hg > truffle
changeset 2689:8fcf5179aafd
Sync with renames in Maxine code base.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 18 May 2011 09:44:05 +0200 |
| parents | 3396862d4cee |
| children | abb4cc15283d bcbda467e1ae |
| files | graal/hotspot/hotspot Default.launch src/share/vm/runtime/arguments.cpp |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/hotspot/hotspot Default.launch Wed May 18 08:54:51 2011 +0200 +++ b/graal/hotspot/hotspot Default.launch Wed May 18 09:44:05 2011 +0200 @@ -15,7 +15,7 @@ <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/> <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/> <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/> -<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-client -XX:+UseC1X -XX:+PrintGC -Xms1g -Xmx1g -Xbootclasspath/p:${workspace_loc:hotspot}/../../../maxine/C1X/bin:${workspace_loc:hotspot}/../../../maxine/CRI/bin:${workspace_loc:hotspot}/../../../maxine/Base/bin:${workspace_loc:hotspot}/../../../maxine/Assembler/bin:${workspace_loc:hotspot}/../HotSpotVM/bin -classpath ${workspace_loc:hotspot}/../HotSpotTest/bin C1XTest"/> +<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-client -XX:+UseC1X -XX:+PrintGC -Xms1g -Xmx1g -Xbootclasspath/p:${workspace_loc:hotspot}/../../../maxine/C1X/bin:${workspace_loc:hotspot}/../../../maxine/com.oracle.max.cri/bin:${workspace_loc:hotspot}/../../../maxine/com.oracle.max.base/bin:${workspace_loc:hotspot}/../../../maxine/com.oracle.max.asmdis/bin:${workspace_loc:hotspot}/../HotSpotVM/bin -classpath ${workspace_loc:hotspot}/../HotSpotTest/bin C1XTest"/> <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="java"/> <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="hotspot"/> <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.toolchain.gnu.solaris.base.945602881"/>
--- a/src/share/vm/runtime/arguments.cpp Wed May 18 08:54:51 2011 +0200 +++ b/src/share/vm/runtime/arguments.cpp Wed May 18 09:44:05 2011 +0200 @@ -2682,11 +2682,11 @@ fatal("Must set GRAAL environment variable to a Graal project directory."); } if (PrintVMOptions) tty->print_cr(" GRAAL=%s", graal_dir); - sprintf(temp, "%s/CRI/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.cri/bin", maxine_dir); scp_p->add_prefix(temp); - sprintf(temp, "%s/Base/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.base/bin", maxine_dir); scp_p->add_prefix(temp); - sprintf(temp, "%s/Assembler/bin", maxine_dir); + sprintf(temp, "%s/com.oracle.max.asmdis/bin", maxine_dir); scp_p->add_prefix(temp); sprintf(temp, "%s/com.oracle.max.asm/bin", maxine_dir); scp_p->add_prefix(temp);