comparison src/share/vm/runtime/arguments.cpp @ 1257:7b4415a18c8a

Merge
author kvn
date Fri, 12 Feb 2010 15:27:36 -0800
parents 745c853ee57f 576e77447e3c
children 1c72304f1885
comparison
equal deleted inserted replaced
1249:95d21201c29a 1257:7b4415a18c8a
1 /* 1 /*
2 * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. 2 * Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
2522 FLAG_SET_DEFAULT(UseLargePages, false); 2522 FLAG_SET_DEFAULT(UseLargePages, false);
2523 SOLARIS_ONLY(FLAG_SET_DEFAULT(UseMPSS, false)); 2523 SOLARIS_ONLY(FLAG_SET_DEFAULT(UseMPSS, false));
2524 SOLARIS_ONLY(FLAG_SET_DEFAULT(UseISM, false)); 2524 SOLARIS_ONLY(FLAG_SET_DEFAULT(UseISM, false));
2525 } 2525 }
2526 2526
2527 // Tiered compilation is undefined with C1.
2528 TieredCompilation = false;
2529
2527 #else 2530 #else
2528 if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) { 2531 if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) {
2529 FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1); 2532 FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1);
2530 } 2533 }
2531 // Temporary disable bulk zeroing reduction with G1. See CR 6627983. 2534 // Temporary disable bulk zeroing reduction with G1. See CR 6627983.