Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 2325:8c9c9ee30d71
Merge
author | kvn |
---|---|
date | Thu, 03 Mar 2011 23:31:45 -0800 |
parents | da091bb67459 0ac769a57c64 |
children | 0cd0a06d2535 5d8f5a6dced7 |
comparison
equal
deleted
inserted
replaced
2312:11303bede852 | 2325:8c9c9ee30d71 |
---|---|
2796 TieredCompilation = false; | 2796 TieredCompilation = false; |
2797 #else | 2797 #else |
2798 if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) { | 2798 if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) { |
2799 FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1); | 2799 FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1); |
2800 } | 2800 } |
2801 // Temporary disable bulk zeroing reduction with G1. See CR 6627983. | |
2802 if (UseG1GC) { | |
2803 FLAG_SET_DEFAULT(ReduceBulkZeroing, false); | |
2804 } | |
2805 #endif | 2801 #endif |
2806 | 2802 |
2807 // If we are running in a headless jre, force java.awt.headless property | 2803 // If we are running in a headless jre, force java.awt.headless property |
2808 // to be true unless the property has already been set. | 2804 // to be true unless the property has already been set. |
2809 // Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state. | 2805 // Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state. |