Mercurial > hg > truffle

comparison make/windows/makefiles/vm.make @ 4970:33df1aeaebbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 76841bdd5f3e 719f7007c8e8
children 957c266d8bc5
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
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 # Resource file containing VERSIONINFO 25 # Resource file containing VERSIONINFO
26 Res_Files=.\version.res 26 Res_Files=.\version.res
27 27
28 !include ..\generated\objfiles.make 28 !include ..\generated\objfiles.make
29 29
30 COMMONSRC=$(WorkSpace)\src 30 COMMONSRC=$(WorkSpace)\src
31 ALTSRC=$(WorkSpace)\src\closed 31 ALTSRC=$(WorkSpace)\src\closed
32 32
33 !ifdef RELEASE 33 !ifdef RELEASE
34 !ifdef DEVELOP 34 !ifdef DEVELOP
35 CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG" 35 CXX_FLAGS=$(CXX_FLAGS) /D "DEBUG"
36 !else 36 !else
37 CPP_FLAGS=$(CPP_FLAGS) /D "PRODUCT" 37 CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT"
38 !endif 38 !endif
39 !else 39 !else
40 CPP_FLAGS=$(CPP_FLAGS) /D "ASSERT" 40 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT"
41 !endif 41 !endif
42 42
43 !if "$(Variant)" == "core" 43 !if "$(Variant)" == "core"
44 # No need to define anything, CORE is defined as !COMPILER1 && !COMPILER2 44 # No need to define anything, CORE is defined as !COMPILER1 && !COMPILER2
45 !endif 45 !endif
46 46
47 !if "$(Variant)" == "kernel" 47 !if "$(Variant)" == "kernel"
48 CPP_FLAGS=$(CPP_FLAGS) /D "KERNEL" 48 CXX_FLAGS=$(CXX_FLAGS) /D "KERNEL"
49 !endif 49 !endif
50 50
51 !if "$(Variant)" == "compiler1" 51 !if "$(Variant)" == "compiler1"
52 CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" 52 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1"
53 !endif 53 !endif
54 54
55 !if "$(Variant)" == "compiler2" 55 !if "$(Variant)" == "compiler2"
56 CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER2" 56 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER2"
57 !endif 57 !endif
58 58
59 !if "$(Variant)" == "tiered" 59 !if "$(Variant)" == "tiered"
60 CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "COMPILER2" 60 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" /D "COMPILER2"
61 !endif 61 !endif
62 62
63 !if "$(Variant)" == "graal" 63 !if "$(Variant)" == "graal"
64 CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "GRAAL" 64 CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "GRAAL"
65 !endif 65 !endif
69 !else 69 !else
70 HOTSPOT_LIB_ARCH=$(BUILDARCH) 70 HOTSPOT_LIB_ARCH=$(BUILDARCH)
71 !endif 71 !endif
72 72
73 # The following variables are defined in the generated local.make file. 73 # The following variables are defined in the generated local.make file.
74 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\"" 74 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\""
75 CPP_FLAGS=$(CPP_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" 75 CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\""
76 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" 76 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\""
77 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 77 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
78 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 78 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
79 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 79 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
80 80
81 CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS) 81 !ifndef JAVASE_EMBEDDED
82 CXX_FLAGS=$(CXX_FLAGS) /D "INCLUDE_TRACE"
83 !endif
84
85 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS)
82 86
83 # Define that so jni.h is on correct side 87 # Define that so jni.h is on correct side
84 CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_" 88 CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_"
85 89
86 !if "$(BUILDARCH)" == "ia64" 90 !if "$(BUILDARCH)" == "ia64"
87 STACK_SIZE="/STACK:1048576,262144" 91 STACK_SIZE="/STACK:1048576,262144"
88 !else 92 !else
89 STACK_SIZE= 93 STACK_SIZE=
99 AGCT_EXPORT=/export:AsyncGetCallTrace 103 AGCT_EXPORT=/export:AsyncGetCallTrace
100 !endif 104 !endif
101 !endif 105 !endif
102 106
103 # If you modify exports below please do the corresponding changes in 107 # If you modify exports below please do the corresponding changes in
104 # src/share/tools/ProjectCreator/WinGammaPlatformVC7.java 108 # src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
105 LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \ 109 LD_FLAGS=$(LD_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
106 /export:JNI_GetDefaultJavaVMInitArgs \ 110 /export:JNI_GetDefaultJavaVMInitArgs \
107 /export:JNI_CreateJavaVM \ 111 /export:JNI_CreateJavaVM \
108 /export:JVM_FindClassFromBootLoader \ 112 /export:JVM_FindClassFromBootLoader \
109 /export:JNI_GetCreatedJavaVMs \ 113 /export:JNI_GetCreatedJavaVMs \
110 /export:jio_snprintf \ 114 /export:jio_snprintf \
116 /export:JVM_GetVersionInfo \ 120 /export:JVM_GetVersionInfo \
117 /export:JVM_GetThreadStateNames \ 121 /export:JVM_GetThreadStateNames \
118 /export:JVM_GetThreadStateValues \ 122 /export:JVM_GetThreadStateValues \
119 /export:JVM_InitAgentProperties 123 /export:JVM_InitAgentProperties
120 124
121 CPP_INCLUDE_DIRS=/I "..\generated" 125 CXX_INCLUDE_DIRS=/I "..\generated"
122 126
123 !if exists($(ALTSRC)\share\vm) 127 !if exists($(ALTSRC)\share\vm)
124 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm" 128 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm"
125 !endif 129 !endif
126 130
127 !if exists($(ALTSRC)\os\windows\vm) 131 !if exists($(ALTSRC)\os\windows\vm)
128 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm" 132 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm"
129 !endif 133 !endif
130 134
131 !if exists($(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm) 135 !if exists($(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm)
132 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm" 136 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm"
133 !endif 137 !endif
134 138
135 !if exists($(ALTSRC)\cpu\$(Platform_arch)\vm) 139 !if exists($(ALTSRC)\cpu\$(Platform_arch)\vm)
136 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm" 140 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm"
137 !endif 141 !endif
138 142
139 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) \ 143 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) \
140 /I "$(COMMONSRC)\share\vm" \ 144 /I "$(COMMONSRC)\share\vm" \
141 /I "$(COMMONSRC)\share\vm\precompiled" \ 145 /I "$(COMMONSRC)\share\vm\precompiled" \
142 /I "$(COMMONSRC)\share\vm\prims" \ 146 /I "$(COMMONSRC)\share\vm\prims" \
143 /I "$(COMMONSRC)\os\windows\vm" \ 147 /I "$(COMMONSRC)\os\windows\vm" \
144 /I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \ 148 /I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \
145 /I "$(COMMONSRC)\cpu\$(Platform_arch)\vm" 149 /I "$(COMMONSRC)\cpu\$(Platform_arch)\vm"
146 150
147 CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER 151 CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
148 152
149 !if "$(USE_PRECOMPILED_HEADER)" != "0" 153 !if "$(USE_PRECOMPILED_HEADER)" != "0"
150 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" 154 CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
151 !else 155 !else
152 CPP_USE_PCH=$(CPP_DONT_USE_PCH) 156 CXX_USE_PCH=$(CXX_DONT_USE_PCH)
153 !endif 157 !endif
154 158
155 # Where to find the source code for the virtual machine (is this used?) 159 # Where to find the source code for the virtual machine (is this used?)
156 VM_PATH=../generated 160 VM_PATH=../generated
157 VM_PATH=$(VM_PATH);../generated/adfiles 161 VM_PATH=$(VM_PATH);../generated/adfiles
173 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/memory 177 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/memory
174 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/oops 178 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/oops
175 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/prims 179 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/prims
176 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/runtime 180 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/runtime
177 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/services 181 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/services
182 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/trace
178 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/utilities 183 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/utilities
179 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/libadt 184 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/libadt
180 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os/windows/vm 185 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os/windows/vm
181 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm 186 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm
182 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm 187 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm
183 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto 188 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto
184 189
190 !if exists($(ALTSRC)\share\vm\jfr)
191 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent
192 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent/isolated_deps/util
193 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/jvm
194 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr
195 !endif
196
185 VM_PATH={$(VM_PATH)} 197 VM_PATH={$(VM_PATH)}
186 198
187 # Special case files not using precompiled header files. 199 # Special case files not using precompiled header files.
188 200
189 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 201 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
190 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 202 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
191 203
192 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp 204 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp
193 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp 205 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
194 206
195 os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 207 os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
196 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 208 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
197 209
198 osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 210 osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
199 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 211 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
200 212
201 conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 213 conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
202 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 214 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
203 215
204 getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 216 getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
205 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 217 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
206 218
207 opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp 219 opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp
208 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp 220 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
209 221
210 bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 222 bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
211 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 223 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
212 224
213 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 225 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
214 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 226 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
215 227
216 # Default rules for the Virtual Machine 228 # Default rules for the Virtual Machine
217 {$(COMMONSRC)\share\vm\c1}.cpp.obj:: 229 {$(COMMONSRC)\share\vm\c1}.cpp.obj::
218 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 230 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
219 231
220 {$(COMMONSRC)\share\vm\compiler}.cpp.obj:: 232 {$(COMMONSRC)\share\vm\compiler}.cpp.obj::
221 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 233 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
222 234
223 {$(COMMONSRC)\share\vm\code}.cpp.obj:: 235 {$(COMMONSRC)\share\vm\code}.cpp.obj::
224 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 236 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
225 237
226 {$(COMMONSRC)\share\vm\interpreter}.cpp.obj:: 238 {$(COMMONSRC)\share\vm\interpreter}.cpp.obj::
227 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 239 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
228 240
229 {$(COMMONSRC)\share\vm\ci}.cpp.obj:: 241 {$(COMMONSRC)\share\vm\ci}.cpp.obj::
230 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 242 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
231 243
232 {$(COMMONSRC)\share\vm\classfile}.cpp.obj:: 244 {$(COMMONSRC)\share\vm\classfile}.cpp.obj::
233 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 245 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
234 246
235 {$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: 247 {$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
236 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 248 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
237 249
238 {$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj:: 250 {$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj::
239 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 251 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
240 252
241 {$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj:: 253 {$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
242 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 254 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
243 255
244 {$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: 256 {$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
245 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 257 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
246 258
247 {$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj:: 259 {$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj::
248 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 260 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
249 261
250 {$(COMMONSRC)\share\vm\gc_interface}.cpp.obj:: 262 {$(COMMONSRC)\share\vm\gc_interface}.cpp.obj::
251 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 263 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
252 264
253 {$(COMMONSRC)\share\vm\asm}.cpp.obj:: 265 {$(COMMONSRC)\share\vm\asm}.cpp.obj::
254 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 266 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
255 267
256 {$(COMMONSRC)\share\vm\memory}.cpp.obj:: 268 {$(COMMONSRC)\share\vm\memory}.cpp.obj::
257 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 269 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
258 270
259 {$(COMMONSRC)\share\vm\oops}.cpp.obj:: 271 {$(COMMONSRC)\share\vm\oops}.cpp.obj::
260 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 272 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
261 273
262 {$(COMMONSRC)\share\vm\prims}.cpp.obj:: 274 {$(COMMONSRC)\share\vm\prims}.cpp.obj::
263 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 275 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
264 276
265 {$(COMMONSRC)\share\vm\runtime}.cpp.obj:: 277 {$(COMMONSRC)\share\vm\runtime}.cpp.obj::
266 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 278 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
267 279
268 {$(COMMONSRC)\share\vm\services}.cpp.obj:: 280 {$(COMMONSRC)\share\vm\services}.cpp.obj::
269 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 281 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
282
283 {$(COMMONSRC)\share\vm\trace}.cpp.obj::
284 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
270 285
271 {$(COMMONSRC)\share\vm\utilities}.cpp.obj:: 286 {$(COMMONSRC)\share\vm\utilities}.cpp.obj::
272 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 287 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
273 288
274 {$(COMMONSRC)\share\vm\libadt}.cpp.obj:: 289 {$(COMMONSRC)\share\vm\libadt}.cpp.obj::
275 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 290 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
276 291
277 {$(COMMONSRC)\share\vm\opto}.cpp.obj:: 292 {$(COMMONSRC)\share\vm\opto}.cpp.obj::
278 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 293 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
279 294
280 {$(COMMONSRC)\os\windows\vm}.cpp.obj:: 295 {$(COMMONSRC)\os\windows\vm}.cpp.obj::
281 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 296 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
282 297
283 # This guy should remain a single colon rule because 298 # This guy should remain a single colon rule because
284 # otherwise we can't specify the output filename. 299 # otherwise we can't specify the output filename.
285 {$(COMMONSRC)\os\windows\vm}.rc.res: 300 {$(COMMONSRC)\os\windows\vm}.rc.res:
286 @$(RC) $(RC_FLAGS) /fo"$@" $< 301 @$(RC) $(RC_FLAGS) /fo"$@" $<
287 302
288 {$(COMMONSRC)\cpu\$(Platform_arch)\vm}.cpp.obj:: 303 {$(COMMONSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
289 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 304 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
290 305
291 {$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj:: 306 {$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
292 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 307 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
293 308
294 {$(ALTSRC)\share\vm\c1}.cpp.obj:: 309 {$(ALTSRC)\share\vm\c1}.cpp.obj::
295 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 310 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
296 311
297 {$(ALTSRC)\share\vm\compiler}.cpp.obj:: 312 {$(ALTSRC)\share\vm\compiler}.cpp.obj::
298 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 313 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
299 314
300 {$(ALTSRC)\share\vm\code}.cpp.obj:: 315 {$(ALTSRC)\share\vm\code}.cpp.obj::
301 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 316 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
302 317
303 {$(ALTSRC)\share\vm\interpreter}.cpp.obj:: 318 {$(ALTSRC)\share\vm\interpreter}.cpp.obj::
304 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 319 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
305 320
306 {$(ALTSRC)\share\vm\ci}.cpp.obj:: 321 {$(ALTSRC)\share\vm\ci}.cpp.obj::
307 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 322 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
308 323
309 {$(ALTSRC)\share\vm\classfile}.cpp.obj:: 324 {$(ALTSRC)\share\vm\classfile}.cpp.obj::
310 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 325 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
311 326
312 {$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: 327 {$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
313 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 328 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
314 329
315 {$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj:: 330 {$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj::
316 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 331 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
317 332
318 {$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj:: 333 {$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
319 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 334 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
320 335
321 {$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: 336 {$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
322 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 337 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
323 338
324 {$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj:: 339 {$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj::
325 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 340 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
326 341
327 {$(ALTSRC)\share\vm\gc_interface}.cpp.obj:: 342 {$(ALTSRC)\share\vm\gc_interface}.cpp.obj::
328 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 343 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
329 344
330 {$(ALTSRC)\share\vm\asm}.cpp.obj:: 345 {$(ALTSRC)\share\vm\asm}.cpp.obj::
331 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 346 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
332 347
333 {$(ALTSRC)\share\vm\memory}.cpp.obj:: 348 {$(ALTSRC)\share\vm\memory}.cpp.obj::
334 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 349 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
335 350
336 {$(ALTSRC)\share\vm\oops}.cpp.obj:: 351 {$(ALTSRC)\share\vm\oops}.cpp.obj::
337 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 352 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
338 353
339 {$(ALTSRC)\share\vm\prims}.cpp.obj:: 354 {$(ALTSRC)\share\vm\prims}.cpp.obj::
340 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 355 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
341 356
342 {$(ALTSRC)\share\vm\runtime}.cpp.obj:: 357 {$(ALTSRC)\share\vm\runtime}.cpp.obj::
343 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 358 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
344 359
345 {$(ALTSRC)\share\vm\services}.cpp.obj:: 360 {$(ALTSRC)\share\vm\services}.cpp.obj::
346 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 361 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
362
363 {$(ALTSRC)\share\vm\trace}.cpp.obj::
364 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
347 365
348 {$(ALTSRC)\share\vm\utilities}.cpp.obj:: 366 {$(ALTSRC)\share\vm\utilities}.cpp.obj::
349 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 367 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
350 368
351 {$(ALTSRC)\share\vm\libadt}.cpp.obj:: 369 {$(ALTSRC)\share\vm\libadt}.cpp.obj::
352 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 370 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
353 371
354 {$(ALTSRC)\share\vm\opto}.cpp.obj:: 372 {$(ALTSRC)\share\vm\opto}.cpp.obj::
355 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 373 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
356 374
357 {$(ALTSRC)\os\windows\vm}.cpp.obj:: 375 {$(ALTSRC)\os\windows\vm}.cpp.obj::
358 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 376 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
359 377
360 # otherwise we can't specify the output filename. 378 # otherwise we can't specify the output filename.
361 {$(ALTSRC)\os\windows\vm}.rc.res: 379 {$(ALTSRC)\os\windows\vm}.rc.res:
362 @$(RC) $(RC_FLAGS) /fo"$@" $< 380 @$(RC) $(RC_FLAGS) /fo"$@" $<
363 381
364 {$(ALTSRC)\cpu\$(Platform_arch)\vm}.cpp.obj:: 382 {$(ALTSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
365 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 383 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
366 384
367 {$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj:: 385 {$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
368 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 386 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
369 387
370 {..\generated\incls}.cpp.obj:: 388 {..\generated\incls}.cpp.obj::
371 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 389 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
372 390
373 {..\generated\adfiles}.cpp.obj:: 391 {..\generated\adfiles}.cpp.obj::
374 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 392 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
375 393
376 {..\generated\jvmtifiles}.cpp.obj:: 394 {..\generated\jvmtifiles}.cpp.obj::
377 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 395 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
396
397 {$(ALTSRC)\share\vm\jfr}.cpp.obj::
398 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
399
400 {$(ALTSRC)\share\vm\jfr\agent}.cpp.obj::
401 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
402
403 {$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj::
404 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
405
406 {$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj::
407 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
378 408
379 default:: 409 default::
380 410
381 _build_pch_file.obj: 411 _build_pch_file.obj:
382 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp 412 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp
383 $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp 413 $(CXX) $(CXX_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp