Mercurial > hg > truffle

changeset 4274:2d2b31b6feae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move graal class path entries into a separate file that can be generated by the mx script
author Lukas Stadler <lukas.stadler@jku.at>
date Thu, 12 Jan 2012 14:50:14 +0100
parents 0519dc447740
children afe0c2480dfd
files src/share/vm/graal/graal_paths.hpp src/share/vm/runtime/arguments.cpp
diffstat 2 files changed, 41 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/graal/graal_paths.hpp	Thu Jan 12 14:50:14 2012 +0100
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.cri");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.criutils");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.base");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.asmdis");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.asm");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.graph");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.compiler.infrastructure");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.lir");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.compilation");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.compiler.phases");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.compiler");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.nodes");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.snippets");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.hotspot");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.printer");
+    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.java");
+
--- a/src/share/vm/runtime/arguments.cpp	Wed Jan 11 18:59:33 2012 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Thu Jan 12 14:50:14 2012 +0100
@@ -2098,18 +2098,7 @@
     if (PrintVMOptions) tty->print_cr("GRAAL=%s", graal_dir);
 
     SysClassPath scp_compiler(Arguments::get_sysclasspath());
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.cri");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.criutils");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.base");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.asmdis");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.asm");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.graph");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.compiler");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.nodes");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.snippets");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.hotspot");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.printer");
-    prepend_to_graal_classpath(scp_compiler, graal_dir, "com.oracle.max.graal.java");
+#include "graal/graal_paths.hpp"
     scp_compiler.expand_endorsed();
 
     Arguments::set_compilerclasspath(scp_compiler.combined_path());