Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 12276:dfae98867ee8
8024826: (s) : Remove alt-rt.jar, used by +AggressiveOps
Reviewed-by: alanb, chegar, dholmes, ksrini
Contributed-by: Mike Duigou <mike.duigou@oracle.com>
author | dholmes |
---|---|
date | Wed, 18 Sep 2013 20:08:00 -0400 |
parents | 621eda7235d2 |
children | 9ed97b511b26 |
comparison
equal
deleted
inserted
replaced
12275:63147986a428 | 12276:dfae98867ee8 |
---|---|
2407 result = parse_each_vm_init_arg(args, &scp, &scp_assembly_required, COMMAND_LINE); | 2407 result = parse_each_vm_init_arg(args, &scp, &scp_assembly_required, COMMAND_LINE); |
2408 if (result != JNI_OK) { | 2408 if (result != JNI_OK) { |
2409 return result; | 2409 return result; |
2410 } | 2410 } |
2411 | 2411 |
2412 if (AggressiveOpts) { | |
2413 // Insert alt-rt.jar between user-specified bootclasspath | |
2414 // prefix and the default bootclasspath. os::set_boot_path() | |
2415 // uses meta_index_dir as the default bootclasspath directory. | |
2416 const char* altclasses_jar = "alt-rt.jar"; | |
2417 size_t altclasses_path_len = strlen(get_meta_index_dir()) + 1 + | |
2418 strlen(altclasses_jar); | |
2419 char* altclasses_path = NEW_C_HEAP_ARRAY(char, altclasses_path_len, mtInternal); | |
2420 strcpy(altclasses_path, get_meta_index_dir()); | |
2421 strcat(altclasses_path, altclasses_jar); | |
2422 scp.add_suffix_to_prefix(altclasses_path); | |
2423 scp_assembly_required = true; | |
2424 FREE_C_HEAP_ARRAY(char, altclasses_path, mtInternal); | |
2425 } | |
2426 | |
2427 // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM) | 2412 // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM) |
2428 result = parse_java_options_environment_variable(&scp, &scp_assembly_required); | 2413 result = parse_java_options_environment_variable(&scp, &scp_assembly_required); |
2429 if (result != JNI_OK) { | 2414 if (result != JNI_OK) { |
2430 return result; | 2415 return result; |
2431 } | 2416 } |