comparison src/share/vm/runtime/arguments.cpp @ 4774:865e0817f32b

Merge
author kamg
date Tue, 10 Jan 2012 15:47:19 -0500
parents d725f0affb1a 4f25538b54c9
children 31a5b9aad4bc a5244e07b761
comparison
equal deleted inserted replaced
4771:22cee0ee8927 4774:865e0817f32b
2328 VM_Version::internal_vm_info_string()); 2328 VM_Version::internal_vm_info_string());
2329 vm_exit(0); 2329 vm_exit(0);
2330 #ifndef PRODUCT 2330 #ifndef PRODUCT
2331 // -Xprintflags 2331 // -Xprintflags
2332 } else if (match_option(option, "-Xprintflags", &tail)) { 2332 } else if (match_option(option, "-Xprintflags", &tail)) {
2333 CommandLineFlags::printFlags(); 2333 CommandLineFlags::printFlags(tty, false);
2334 vm_exit(0); 2334 vm_exit(0);
2335 #endif 2335 #endif
2336 // -D 2336 // -D
2337 } else if (match_option(option, "-D", &tail)) { 2337 } else if (match_option(option, "-D", &tail)) {
2338 if (!add_property(tail)) { 2338 if (!add_property(tail)) {
2976 } 2976 }
2977 if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) { 2977 if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
2978 IgnoreUnrecognizedVMOptions = false; 2978 IgnoreUnrecognizedVMOptions = false;
2979 } 2979 }
2980 if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) { 2980 if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
2981 CommandLineFlags::printFlags(); 2981 CommandLineFlags::printFlags(tty, false);
2982 vm_exit(0); 2982 vm_exit(0);
2983 } 2983 }
2984 2984
2985 #ifndef PRODUCT 2985 #ifndef PRODUCT
2986 if (match_option(option, "-XX:+PrintFlagsWithComments", &tail)) { 2986 if (match_option(option, "-XX:+PrintFlagsWithComments", &tail)) {
2987 CommandLineFlags::printFlags(true); 2987 CommandLineFlags::printFlags(tty, true);
2988 vm_exit(0); 2988 vm_exit(0);
2989 } 2989 }
2990 #endif 2990 #endif
2991 } 2991 }
2992 2992
3175 } 3175 }
3176 } 3176 }
3177 #endif 3177 #endif
3178 3178
3179 if (PrintCommandLineFlags) { 3179 if (PrintCommandLineFlags) {
3180 CommandLineFlags::printSetFlags(); 3180 CommandLineFlags::printSetFlags(tty);
3181 } 3181 }
3182 3182
3183 // Apply CPU specific policy for the BiasedLocking 3183 // Apply CPU specific policy for the BiasedLocking
3184 if (UseBiasedLocking) { 3184 if (UseBiasedLocking) {
3185 if (!VM_Version::use_biased_locking() && 3185 if (!VM_Version::use_biased_locking() &&