Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/arguments.cpp @ 8105:94478a033036
Merge
author | sspitsyn |
---|---|
date | Fri, 22 Feb 2013 10:16:51 -0800 |
parents | 1ba18258caa4 1b0dc9f87e75 |
children | 5fc51c1ecdeb 11d5942ef9c7 fad90b102190 209f8ba5020b |
comparison
equal
deleted
inserted
replaced
8091:ed96c6015470 | 8105:94478a033036 |
---|---|
2177 strcpy(altclasses_path, get_meta_index_dir()); | 2177 strcpy(altclasses_path, get_meta_index_dir()); |
2178 strcat(altclasses_path, altclasses_jar); | 2178 strcat(altclasses_path, altclasses_jar); |
2179 scp.add_suffix_to_prefix(altclasses_path); | 2179 scp.add_suffix_to_prefix(altclasses_path); |
2180 scp_assembly_required = true; | 2180 scp_assembly_required = true; |
2181 FREE_C_HEAP_ARRAY(char, altclasses_path, mtInternal); | 2181 FREE_C_HEAP_ARRAY(char, altclasses_path, mtInternal); |
2182 } | |
2183 | |
2184 if (WhiteBoxAPI) { | |
2185 // Append wb.jar to bootclasspath if enabled | |
2186 const char* wb_jar = "wb.jar"; | |
2187 size_t wb_path_len = strlen(get_meta_index_dir()) + 1 + | |
2188 strlen(wb_jar); | |
2189 char* wb_path = NEW_C_HEAP_ARRAY(char, wb_path_len, mtInternal); | |
2190 strcpy(wb_path, get_meta_index_dir()); | |
2191 strcat(wb_path, wb_jar); | |
2192 scp.add_suffix(wb_path); | |
2193 scp_assembly_required = true; | |
2194 FREE_C_HEAP_ARRAY(char, wb_path, mtInternal); | |
2195 } | 2182 } |
2196 | 2183 |
2197 // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM) | 2184 // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM) |
2198 result = parse_java_options_environment_variable(&scp, &scp_assembly_required); | 2185 result = parse_java_options_environment_variable(&scp, &scp_assembly_required); |
2199 if (result != JNI_OK) { | 2186 if (result != JNI_OK) { |