Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 3535:c919f101c1bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified bootclasspath to reflect new structure. No longer need GRAAL environment variable.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 10 Aug 2011 01:31:45 +0200
parents be4ca325525a
children 694c38d4b6d8 344264424174
comparison
equal deleted inserted replaced
3534:a97b5881c222 3535:c919f101c1bf
2679 } 2679 }
2680 UseGraal = true; 2680 UseGraal = true;
2681 BootstrapGraal = true; 2681 BootstrapGraal = true;
2682 const int BUFFER_SIZE = 1024; 2682 const int BUFFER_SIZE = 1024;
2683 char maxine_dir[BUFFER_SIZE]; 2683 char maxine_dir[BUFFER_SIZE];
2684 char graal_dir[BUFFER_SIZE];
2685 char temp[BUFFER_SIZE]; 2684 char temp[BUFFER_SIZE];
2686 if (!os::getenv("MAXINE", maxine_dir, sizeof(maxine_dir))) { 2685 if (!os::getenv("MAXINE", maxine_dir, sizeof(maxine_dir))) {
2687 fatal("Must set MAXINE environment variable to a Maxine project directory."); 2686 fatal("Must set MAXINE environment variable to a Maxine project directory.");
2688 } 2687 }
2689 if (PrintVMOptions) tty->print("MAXINE=%s", maxine_dir); 2688 if (PrintVMOptions) tty->print("MAXINE=%s", maxine_dir);
2690 if (!os::getenv("GRAAL", graal_dir, sizeof(graal_dir))) {
2691 fatal("Must set GRAAL environment variable to a Graal project directory.");
2692 }
2693 if (PrintVMOptions) tty->print_cr(" GRAAL=%s", graal_dir);
2694 sprintf(temp, "%s/com.oracle.max.cri/bin", maxine_dir); 2689 sprintf(temp, "%s/com.oracle.max.cri/bin", maxine_dir);
2695 scp_p->add_prefix(temp); 2690 scp_p->add_prefix(temp);
2696 sprintf(temp, "%s/com.oracle.max.base/bin", maxine_dir); 2691 sprintf(temp, "%s/com.oracle.max.base/bin", maxine_dir);
2697 scp_p->add_prefix(temp); 2692 scp_p->add_prefix(temp);
2698 sprintf(temp, "%s/com.oracle.max.asmdis/bin", maxine_dir); 2693 sprintf(temp, "%s/com.oracle.max.asmdis/bin", maxine_dir);
2699 scp_p->add_prefix(temp); 2694 scp_p->add_prefix(temp);
2700 sprintf(temp, "%s/com.oracle.max.asm/bin", maxine_dir); 2695 sprintf(temp, "%s/com.oracle.max.asm/bin", maxine_dir);
2701 scp_p->add_prefix(temp); 2696 scp_p->add_prefix(temp);
2702 sprintf(temp, "%s/com.oracle.max.graal.graph/bin", maxine_dir); 2697 sprintf(temp, "%s/com.oracle.max.graal.graph/bin", maxine_dir);
2703 scp_p->add_prefix(temp); 2698 scp_p->add_prefix(temp);
2704 sprintf(temp, "%s/graal/com.oracle.max.graal.compiler/bin", graal_dir); 2699 sprintf(temp, "%s/com.oracle.max.graal.compiler/bin", maxine_dir);
2705 scp_p->add_prefix(temp); 2700 scp_p->add_prefix(temp);
2706 sprintf(temp, "%s/graal/com.oracle.max.graal.runtime/bin", graal_dir); 2701 sprintf(temp, "%s/com.oracle.max.graal.nodes/bin", maxine_dir);
2707 scp_p->add_prefix(temp); 2702 scp_p->add_prefix(temp);
2708 sprintf(temp, "%s/graal/com.oracle.max.graal.graphviz/bin", graal_dir); 2703 sprintf(temp, "%s/com.oracle.max.graal.extensions/bin", maxine_dir);
2704 scp_p->add_prefix(temp);
2705 sprintf(temp, "%s/com.oracle.max.graal.runtime/bin", maxine_dir);
2706 scp_p->add_prefix(temp);
2707 sprintf(temp, "%s/com.oracle.max.graal.graphviz/bin", maxine_dir);
2709 scp_p->add_prefix(temp); 2708 scp_p->add_prefix(temp);
2710 *scp_assembly_required_p = true; 2709 *scp_assembly_required_p = true;
2711 } else if (match_option(option, "-G:", &tail)) { // -G:XXX 2710 } else if (match_option(option, "-G:", &tail)) { // -G:XXX
2712 // Option for the graal compiler. 2711 // Option for the graal compiler.
2713 if (PrintVMOptions) { 2712 if (PrintVMOptions) {