annotate make/hotspot_version @ 3927:f1b4e0e0bdad

7089625: G1: policy for how many old regions to add to the CSet (when young gen is fixed) is broken Summary: When refactoring the code for a previous fix, a condition was not correctly negated which prevents the G1 policy from adding the correct number of old regions to the CSet when the young gen size is fixed. The changeset also fixes a small syntactical issue in g1ErgoVerbose.hpp which is causing compiler warnings. Reviewed-by: brutisso, ysr
author tonyp
date Tue, 13 Sep 2011 12:40:14 -0400
parents 513a84dd0f8b
children 650d15d8f372
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1 #
2064
9fc3ffb1e0b1 7011125: Bump the HS20 build number to 06
trims
parents: 2042
diff changeset
2 # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a61af66fc99e Initial load
duke
parents:
diff changeset
4 #
a61af66fc99e Initial load
duke
parents:
diff changeset
5 # This code is free software; you can redistribute it and/or modify it
a61af66fc99e Initial load
duke
parents:
diff changeset
6 # under the terms of the GNU General Public License version 2 only, as
a61af66fc99e Initial load
duke
parents:
diff changeset
7 # published by the Free Software Foundation.
a61af66fc99e Initial load
duke
parents:
diff changeset
8 #
a61af66fc99e Initial load
duke
parents:
diff changeset
9 # This code is distributed in the hope that it will be useful, but WITHOUT
a61af66fc99e Initial load
duke
parents:
diff changeset
10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a61af66fc99e Initial load
duke
parents:
diff changeset
11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a61af66fc99e Initial load
duke
parents:
diff changeset
12 # version 2 for more details (a copy is included in the LICENSE file that
a61af66fc99e Initial load
duke
parents:
diff changeset
13 # accompanied this code).
a61af66fc99e Initial load
duke
parents:
diff changeset
14 #
a61af66fc99e Initial load
duke
parents:
diff changeset
15 # You should have received a copy of the GNU General Public License version
a61af66fc99e Initial load
duke
parents:
diff changeset
16 # 2 along with this work; if not, write to the Free Software Foundation,
a61af66fc99e Initial load
duke
parents:
diff changeset
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a61af66fc99e Initial load
duke
parents:
diff changeset
18 #
1552
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 1532
diff changeset
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 1532
diff changeset
20 # or visit www.oracle.com if you need additional information or have any
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 1532
diff changeset
21 # questions.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
22 #
a61af66fc99e Initial load
duke
parents:
diff changeset
23
a61af66fc99e Initial load
duke
parents:
diff changeset
24 #
a61af66fc99e Initial load
duke
parents:
diff changeset
25 #
a61af66fc99e Initial load
duke
parents:
diff changeset
26
a61af66fc99e Initial load
duke
parents:
diff changeset
27 #
a61af66fc99e Initial load
duke
parents:
diff changeset
28 # Master Hotspot version file. These values may be overridden by a control
a61af66fc99e Initial load
duke
parents:
diff changeset
29 # workspace build. This file format must remain compatible with both
a61af66fc99e Initial load
duke
parents:
diff changeset
30 # GNU Makefile and Microsoft nmake formats.
a61af66fc99e Initial load
duke
parents:
diff changeset
31 #
a61af66fc99e Initial load
duke
parents:
diff changeset
32
a61af66fc99e Initial load
duke
parents:
diff changeset
33 # Don't put quotes (fail windows build).
2064
9fc3ffb1e0b1 7011125: Bump the HS20 build number to 06
trims
parents: 2042
diff changeset
34 HOTSPOT_VM_COPYRIGHT=Copyright 2011
0
a61af66fc99e Initial load
duke
parents:
diff changeset
35
3760
e2af886d540b 7061691: Fork HS21 to HS22 - renumber Minor and build numbers of JVM
trims
parents: 3391
diff changeset
36 HS_MAJOR_VER=22
0
a61af66fc99e Initial load
duke
parents:
diff changeset
37 HS_MINOR_VER=0
3925
513a84dd0f8b 7088991: Bump ths hs22 build number to 05
jcoomes
parents: 3883
diff changeset
38 HS_BUILD_NUMBER=05
0
a61af66fc99e Initial load
duke
parents:
diff changeset
39
a61af66fc99e Initial load
duke
parents:
diff changeset
40 JDK_MAJOR_VER=1
3811
8e5d4aa73a8c 7069176: Update the JDK version numbers in Hotspot for JDK 8
trims
parents: 3760
diff changeset
41 JDK_MINOR_VER=8
0
a61af66fc99e Initial load
duke
parents:
diff changeset
42 JDK_MICRO_VER=0
a61af66fc99e Initial load
duke
parents:
diff changeset
43
a61af66fc99e Initial load
duke
parents:
diff changeset
44 # Previous (bootdir) JDK version
3811
8e5d4aa73a8c 7069176: Update the JDK version numbers in Hotspot for JDK 8
trims
parents: 3760
diff changeset
45 JDK_PREVIOUS_VERSION=1.7.0