Mercurial > hg > truffle

diff src/share/vm/runtime/arguments.hpp @ 4559:723df37192d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make it possible again to build a real client libjvm, drop the UseGraal flag. Use the --vm option instead of a special -vm option in the bench command
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 10 Feb 2012 17:04:03 +0100
parents 4aa80ca3dbec
children d4e039a3e083
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.hpp	Fri Feb 10 02:22:23 2012 +0100
+++ b/src/share/vm/runtime/arguments.hpp	Fri Feb 10 17:04:03 2012 +0100
@@ -245,7 +245,9 @@
   static SystemProperty *_java_home;
   static SystemProperty *_java_class_path;
   static SystemProperty *_sun_boot_class_path;
+#ifdef GRAAL
   static SystemProperty *_compiler_class_path;
+#endif
 
   // Meta-index for knowing what packages are in the boot class path
   static char* _meta_index_path;
@@ -370,7 +372,9 @@
   // methods to build strings from individual args
   static void build_jvm_args(const char* arg);
   static void build_jvm_flags(const char* arg);
+#ifdef GRAAL
   static void add_graal_arg(const char* arg);
+#endif
   static void add_string(char*** bldarray, int* count, const char* arg);
   static const char* build_resource_string(char** args, int count);
 
@@ -426,7 +430,9 @@
   // return a char* array containing all options
   static char** jvm_flags_array()          { return _jvm_flags_array; }
   static char** jvm_args_array()           { return _jvm_args_array; }
+#ifdef GRAAL
   static char** graal_args_array()           { return _graal_args_array; }
+#endif
   static int num_jvm_flags()               { return _num_jvm_flags; }
   static int num_graal_args()               { return _num_graal_args; }
   static int num_jvm_args()                { return _num_jvm_args; }
@@ -526,7 +532,9 @@
   static void set_ext_dirs(char *value) { _java_ext_dirs->set_value(value); }
   static void set_endorsed_dirs(char *value) { _java_endorsed_dirs->set_value(value); }
   static void set_sysclasspath(char *value) { _sun_boot_class_path->set_value(value); }
+#ifdef GRAAL
   static void set_compilerclasspath(char *value) { _compiler_class_path->set_value(value); }
+#endif
   static void append_sysclasspath(const char *value) { _sun_boot_class_path->append_value(value); }
   static void set_meta_index_path(char* meta_index_path, char* meta_index_dir) {
     _meta_index_path = meta_index_path;
@@ -537,7 +545,9 @@
   static char *get_dll_dir() { return _sun_boot_library_path->value(); }
   static char *get_endorsed_dir() { return _java_endorsed_dirs->value(); }
   static char *get_sysclasspath() { return _sun_boot_class_path->value(); }
+#ifdef GRAAL
   static char *get_compilerclasspath() { return _compiler_class_path->value(); }
+#endif
   static char* get_meta_index_path() { return _meta_index_path; }
   static char* get_meta_index_dir()  { return _meta_index_dir;  }