Mercurial > hg > truffle

comparison make/windows/build.make @ 1783:d5d065957597

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6953144: Tiered compilation Summary: Infrastructure for tiered compilation support (interpreter + c1 + c2) for 32 and 64 bit. Simple tiered policy implementation. Reviewed-by: kvn, never, phh, twisti
author iveresov
date Fri, 03 Sep 2010 17:51:07 -0700
parents c18cbe5936b8
children 34bd82eba3bb
comparison
equal deleted inserted replaced
1782:f353275af40e 1783:d5d065957597
1 # 1 #
2 # Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. 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.
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 # 18 #
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 # Note: this makefile is invoked both from build.bat and from the J2SE 25 # Note: this makefile is invoked both from build.bat and from the J2SE
26 # control workspace in exactly the same manner; the required 26 # control workspace in exactly the same manner; the required
27 # environment variables (Variant, WorkSpace, BootStrapDir, BuildUser, HOTSPOT_BUILD_VERSION) 27 # environment variables (Variant, WorkSpace, BootStrapDir, BuildUser, HOTSPOT_BUILD_VERSION)
70 BUILDARCH=ia64 70 BUILDARCH=ia64
71 !endif 71 !endif
72 !endif 72 !endif
73 !endif 73 !endif
74 74
75 !if "$(BUILDARCH)" != "amd64"
76 !if "$(BUILDARCH)" != "ia64" 75 !if "$(BUILDARCH)" != "ia64"
77 !ifndef CC_INTERP 76 !ifndef CC_INTERP
78 FORCE_TIERED=1 77 FORCE_TIERED=1
79 !endif
80 !endif 78 !endif
81 !endif 79 !endif
82 80
83 !if "$(BUILDARCH)" == "amd64" 81 !if "$(BUILDARCH)" == "amd64"
84 Platform_arch=x86 82 Platform_arch=x86
133 131
134 # Following the Web Start / Plugin model here.... 132 # Following the Web Start / Plugin model here....
135 # We can have update versions like "01a", but Windows requires 133 # We can have update versions like "01a", but Windows requires
136 # we use only integers in the file version field. So: 134 # we use only integers in the file version field. So:
137 # JDK_UPDATE_VER = JDK_UPDATE_VERSION * 10 + EXCEPTION_VERSION 135 # JDK_UPDATE_VER = JDK_UPDATE_VERSION * 10 + EXCEPTION_VERSION
138 # 136 #
139 JDK_UPDATE_VER=0 137 JDK_UPDATE_VER=0
140 JDK_BUILD_NUMBER=0 138 JDK_BUILD_NUMBER=0
141 139
142 HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(ARCH_TEXT) $(VARIANT_TEXT) VM 140 HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(ARCH_TEXT) $(VARIANT_TEXT) VM
143 141
146 # Thus, 1.5.0_10-b04 will be 5.0.100.4 144 # Thus, 1.5.0_10-b04 will be 5.0.100.4
147 # 1.6.0-b01 will be 6.0.0.1 145 # 1.6.0-b01 will be 6.0.0.1
148 # 1.6.0_01a-b02 will be 6.0.11.2 146 # 1.6.0_01a-b02 will be 6.0.11.2
149 # 147 #
150 # JDK_* variables are defined in make/hotspot_version or on command line 148 # JDK_* variables are defined in make/hotspot_version or on command line
151 # 149 #
152 JDK_VER=$(JDK_MINOR_VER),$(JDK_MICRO_VER),$(JDK_UPDATE_VER),$(JDK_BUILD_NUMBER) 150 JDK_VER=$(JDK_MINOR_VER),$(JDK_MICRO_VER),$(JDK_UPDATE_VER),$(JDK_BUILD_NUMBER)
153 JDK_DOTVER=$(JDK_MINOR_VER).$(JDK_MICRO_VER).$(JDK_UPDATE_VER).$(JDK_BUILD_NUMBER) 151 JDK_DOTVER=$(JDK_MINOR_VER).$(JDK_MICRO_VER).$(JDK_UPDATE_VER).$(JDK_BUILD_NUMBER)
154 !if "$(JRE_RELEASE_VERSION)" == "" 152 !if "$(JRE_RELEASE_VERSION)" == ""
155 JRE_RELEASE_VER=$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER) 153 JRE_RELEASE_VER=$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)
156 !else 154 !else
160 JDK_MKTG_VERSION=$(JDK_MINOR_VER).$(JDK_MICRO_VER) 158 JDK_MKTG_VERSION=$(JDK_MINOR_VER).$(JDK_MICRO_VER)
161 !endif 159 !endif
162 160
163 # Hotspot Express VM FileVersion: 161 # Hotspot Express VM FileVersion:
164 # 10.0-b<yz> will have DLL version 10.0.0.yz (need 4 numbers). 162 # 10.0-b<yz> will have DLL version 10.0.0.yz (need 4 numbers).
165 # 163 #
166 # HS_* variables are defined in make/hotspot_version 164 # HS_* variables are defined in make/hotspot_version
167 # 165 #
168 HS_VER=$(HS_MAJOR_VER),$(HS_MINOR_VER),0,$(HS_BUILD_NUMBER) 166 HS_VER=$(HS_MAJOR_VER),$(HS_MINOR_VER),0,$(HS_BUILD_NUMBER)
169 HS_DOTVER=$(HS_MAJOR_VER).$(HS_MINOR_VER).0.$(HS_BUILD_NUMBER) 167 HS_DOTVER=$(HS_MAJOR_VER).$(HS_MINOR_VER).0.$(HS_BUILD_NUMBER)
170 168
180 178
181 # End VERSIONINFO parameters 179 # End VERSIONINFO parameters
182 180
183 181
184 # We don't support SA on ia64, and we can't 182 # We don't support SA on ia64, and we can't
185 # build it if we are using a version of Vis Studio 183 # build it if we are using a version of Vis Studio
186 # older than .Net 2003. 184 # older than .Net 2003.
187 # SA_INCLUDE and SA_LIB are hold-overs from a previous 185 # SA_INCLUDE and SA_LIB are hold-overs from a previous
188 # implementation in which we could build SA using 186 # implementation in which we could build SA using
189 # Debugging Tools For Windows, in which the .h/.lib files 187 # Debugging Tools For Windows, in which the .h/.lib files
190 # and the .dlls are in different places than 188 # and the .dlls are in different places than