Mercurial > hg > truffle

comparison make/windows/makefiles/vm.make @ 4891:719f7007c8e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7141242: build-infra merge: Rename CPP->CXX and LINK->LD Summary: Cleaned up make variables for compilers and linker to consistently use CXX for C++ compiler, CC for C compiler and LD for linker. Reviewed-by: dholmes, ohrstrom
author erikj
date Mon, 06 Feb 2012 09:14:22 +0100
parents 94ec88ca68e2
children 33df1aeaebbf 51612f0c0a79
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
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 "$(BUILDARCH)" == "i486" 63 !if "$(BUILDARCH)" == "i486"
64 HOTSPOT_LIB_ARCH=i386 64 HOTSPOT_LIB_ARCH=i386
65 !else 65 !else
66 HOTSPOT_LIB_ARCH=$(BUILDARCH) 66 HOTSPOT_LIB_ARCH=$(BUILDARCH)
67 !endif 67 !endif
68 68
69 # The following variables are defined in the generated local.make file. 69 # The following variables are defined in the generated local.make file.
70 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\"" 70 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\""
71 CPP_FLAGS=$(CPP_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" 71 CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\""
72 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" 72 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\""
73 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 73 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
74 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 74 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
75 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 75 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
76 76
77 !ifndef JAVASE_EMBEDDED 77 !ifndef JAVASE_EMBEDDED
78 CPP_FLAGS=$(CPP_FLAGS) /D "INCLUDE_TRACE" 78 CXX_FLAGS=$(CXX_FLAGS) /D "INCLUDE_TRACE"
79 !endif 79 !endif
80 80
81 CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS) 81 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS)
82 82
83 # Define that so jni.h is on correct side 83 # Define that so jni.h is on correct side
84 CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_" 84 CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_"
85 85
86 !if "$(BUILDARCH)" == "ia64" 86 !if "$(BUILDARCH)" == "ia64"
87 STACK_SIZE="/STACK:1048576,262144" 87 STACK_SIZE="/STACK:1048576,262144"
88 !else 88 !else
89 STACK_SIZE= 89 STACK_SIZE=
100 !endif 100 !endif
101 !endif 101 !endif
102 102
103 # If you modify exports below please do the corresponding changes in 103 # If you modify exports below please do the corresponding changes in
104 # src/share/tools/ProjectCreator/WinGammaPlatformVC7.java 104 # src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
105 LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \ 105 LD_FLAGS=$(LD_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
106 /export:JNI_GetDefaultJavaVMInitArgs \ 106 /export:JNI_GetDefaultJavaVMInitArgs \
107 /export:JNI_CreateJavaVM \ 107 /export:JNI_CreateJavaVM \
108 /export:JVM_FindClassFromBootLoader \ 108 /export:JVM_FindClassFromBootLoader \
109 /export:JNI_GetCreatedJavaVMs \ 109 /export:JNI_GetCreatedJavaVMs \
110 /export:jio_snprintf \ 110 /export:jio_snprintf \
116 /export:JVM_GetVersionInfo \ 116 /export:JVM_GetVersionInfo \
117 /export:JVM_GetThreadStateNames \ 117 /export:JVM_GetThreadStateNames \
118 /export:JVM_GetThreadStateValues \ 118 /export:JVM_GetThreadStateValues \
119 /export:JVM_InitAgentProperties 119 /export:JVM_InitAgentProperties
120 120
121 CPP_INCLUDE_DIRS=/I "..\generated" 121 CXX_INCLUDE_DIRS=/I "..\generated"
122 122
123 !if exists($(ALTSRC)\share\vm) 123 !if exists($(ALTSRC)\share\vm)
124 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm" 124 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm"
125 !endif 125 !endif
126 126
127 !if exists($(ALTSRC)\os\windows\vm) 127 !if exists($(ALTSRC)\os\windows\vm)
128 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm" 128 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm"
129 !endif 129 !endif
130 130
131 !if exists($(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm) 131 !if exists($(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm)
132 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm" 132 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm"
133 !endif 133 !endif
134 134
135 !if exists($(ALTSRC)\cpu\$(Platform_arch)\vm) 135 !if exists($(ALTSRC)\cpu\$(Platform_arch)\vm)
136 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm" 136 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm"
137 !endif 137 !endif
138 138
139 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) \ 139 CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) \
140 /I "$(COMMONSRC)\share\vm" \ 140 /I "$(COMMONSRC)\share\vm" \
141 /I "$(COMMONSRC)\share\vm\precompiled" \ 141 /I "$(COMMONSRC)\share\vm\precompiled" \
142 /I "$(COMMONSRC)\share\vm\prims" \ 142 /I "$(COMMONSRC)\share\vm\prims" \
143 /I "$(COMMONSRC)\os\windows\vm" \ 143 /I "$(COMMONSRC)\os\windows\vm" \
144 /I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \ 144 /I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \
145 /I "$(COMMONSRC)\cpu\$(Platform_arch)\vm" 145 /I "$(COMMONSRC)\cpu\$(Platform_arch)\vm"
146 146
147 CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER 147 CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
148 148
149 !if "$(USE_PRECOMPILED_HEADER)" != "0" 149 !if "$(USE_PRECOMPILED_HEADER)" != "0"
150 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" 150 CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
151 !else 151 !else
152 CPP_USE_PCH=$(CPP_DONT_USE_PCH) 152 CXX_USE_PCH=$(CXX_DONT_USE_PCH)
153 !endif 153 !endif
154 154
155 # Where to find the source code for the virtual machine (is this used?) 155 # Where to find the source code for the virtual machine (is this used?)
156 VM_PATH=../generated 156 VM_PATH=../generated
157 VM_PATH=$(VM_PATH);../generated/adfiles 157 VM_PATH=$(VM_PATH);../generated/adfiles
192 VM_PATH={$(VM_PATH)} 192 VM_PATH={$(VM_PATH)}
193 193
194 # Special case files not using precompiled header files. 194 # Special case files not using precompiled header files.
195 195
196 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 196 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
197 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 197 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
198 198
199 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp 199 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp
200 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp 200 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
201 201
202 os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 202 os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
203 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 203 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
204 204
205 osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 205 osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
206 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 206 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
207 207
208 conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 208 conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
209 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 209 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
210 210
211 getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 211 getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
212 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 212 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
213 213
214 opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp 214 opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp
215 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp 215 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
216 216
217 bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 217 bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
218 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 218 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
219 219
220 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 220 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
221 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 221 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
222 222
223 # Default rules for the Virtual Machine 223 # Default rules for the Virtual Machine
224 {$(COMMONSRC)\share\vm\c1}.cpp.obj:: 224 {$(COMMONSRC)\share\vm\c1}.cpp.obj::
225 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 225 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
226 226
227 {$(COMMONSRC)\share\vm\compiler}.cpp.obj:: 227 {$(COMMONSRC)\share\vm\compiler}.cpp.obj::
228 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 228 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
229 229
230 {$(COMMONSRC)\share\vm\code}.cpp.obj:: 230 {$(COMMONSRC)\share\vm\code}.cpp.obj::
231 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 231 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
232 232
233 {$(COMMONSRC)\share\vm\interpreter}.cpp.obj:: 233 {$(COMMONSRC)\share\vm\interpreter}.cpp.obj::
234 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 234 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
235 235
236 {$(COMMONSRC)\share\vm\ci}.cpp.obj:: 236 {$(COMMONSRC)\share\vm\ci}.cpp.obj::
237 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 237 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
238 238
239 {$(COMMONSRC)\share\vm\classfile}.cpp.obj:: 239 {$(COMMONSRC)\share\vm\classfile}.cpp.obj::
240 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 240 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
241 241
242 {$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: 242 {$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
243 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 243 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
244 244
245 {$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj:: 245 {$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj::
246 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 246 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
247 247
248 {$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj:: 248 {$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
249 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 249 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
250 250
251 {$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: 251 {$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
252 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 252 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
253 253
254 {$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj:: 254 {$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj::
255 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 255 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
256 256
257 {$(COMMONSRC)\share\vm\gc_interface}.cpp.obj:: 257 {$(COMMONSRC)\share\vm\gc_interface}.cpp.obj::
258 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 258 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
259 259
260 {$(COMMONSRC)\share\vm\asm}.cpp.obj:: 260 {$(COMMONSRC)\share\vm\asm}.cpp.obj::
261 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 261 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
262 262
263 {$(COMMONSRC)\share\vm\memory}.cpp.obj:: 263 {$(COMMONSRC)\share\vm\memory}.cpp.obj::
264 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 264 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
265 265
266 {$(COMMONSRC)\share\vm\oops}.cpp.obj:: 266 {$(COMMONSRC)\share\vm\oops}.cpp.obj::
267 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 267 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
268 268
269 {$(COMMONSRC)\share\vm\prims}.cpp.obj:: 269 {$(COMMONSRC)\share\vm\prims}.cpp.obj::
270 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 270 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
271 271
272 {$(COMMONSRC)\share\vm\runtime}.cpp.obj:: 272 {$(COMMONSRC)\share\vm\runtime}.cpp.obj::
273 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 273 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
274 274
275 {$(COMMONSRC)\share\vm\services}.cpp.obj:: 275 {$(COMMONSRC)\share\vm\services}.cpp.obj::
276 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 276 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
277 277
278 {$(COMMONSRC)\share\vm\trace}.cpp.obj:: 278 {$(COMMONSRC)\share\vm\trace}.cpp.obj::
279 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 279 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
280 280
281 {$(COMMONSRC)\share\vm\utilities}.cpp.obj:: 281 {$(COMMONSRC)\share\vm\utilities}.cpp.obj::
282 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 282 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
283 283
284 {$(COMMONSRC)\share\vm\libadt}.cpp.obj:: 284 {$(COMMONSRC)\share\vm\libadt}.cpp.obj::
285 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 285 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
286 286
287 {$(COMMONSRC)\share\vm\opto}.cpp.obj:: 287 {$(COMMONSRC)\share\vm\opto}.cpp.obj::
288 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 288 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
289 289
290 {$(COMMONSRC)\os\windows\vm}.cpp.obj:: 290 {$(COMMONSRC)\os\windows\vm}.cpp.obj::
291 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 291 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
292 292
293 # This guy should remain a single colon rule because 293 # This guy should remain a single colon rule because
294 # otherwise we can't specify the output filename. 294 # otherwise we can't specify the output filename.
295 {$(COMMONSRC)\os\windows\vm}.rc.res: 295 {$(COMMONSRC)\os\windows\vm}.rc.res:
296 @$(RC) $(RC_FLAGS) /fo"$@" $< 296 @$(RC) $(RC_FLAGS) /fo"$@" $<
297 297
298 {$(COMMONSRC)\cpu\$(Platform_arch)\vm}.cpp.obj:: 298 {$(COMMONSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
299 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 299 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
300 300
301 {$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj:: 301 {$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
302 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 302 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
303 303
304 {$(ALTSRC)\share\vm\c1}.cpp.obj:: 304 {$(ALTSRC)\share\vm\c1}.cpp.obj::
305 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 305 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
306 306
307 {$(ALTSRC)\share\vm\compiler}.cpp.obj:: 307 {$(ALTSRC)\share\vm\compiler}.cpp.obj::
308 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 308 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
309 309
310 {$(ALTSRC)\share\vm\code}.cpp.obj:: 310 {$(ALTSRC)\share\vm\code}.cpp.obj::
311 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 311 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
312 312
313 {$(ALTSRC)\share\vm\interpreter}.cpp.obj:: 313 {$(ALTSRC)\share\vm\interpreter}.cpp.obj::
314 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 314 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
315 315
316 {$(ALTSRC)\share\vm\ci}.cpp.obj:: 316 {$(ALTSRC)\share\vm\ci}.cpp.obj::
317 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 317 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
318 318
319 {$(ALTSRC)\share\vm\classfile}.cpp.obj:: 319 {$(ALTSRC)\share\vm\classfile}.cpp.obj::
320 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 320 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
321 321
322 {$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: 322 {$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
323 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 323 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
324 324
325 {$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj:: 325 {$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj::
326 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 326 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
327 327
328 {$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj:: 328 {$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
329 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 329 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
330 330
331 {$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: 331 {$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
332 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 332 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
333 333
334 {$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj:: 334 {$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj::
335 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 335 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
336 336
337 {$(ALTSRC)\share\vm\gc_interface}.cpp.obj:: 337 {$(ALTSRC)\share\vm\gc_interface}.cpp.obj::
338 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 338 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
339 339
340 {$(ALTSRC)\share\vm\asm}.cpp.obj:: 340 {$(ALTSRC)\share\vm\asm}.cpp.obj::
341 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 341 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
342 342
343 {$(ALTSRC)\share\vm\memory}.cpp.obj:: 343 {$(ALTSRC)\share\vm\memory}.cpp.obj::
344 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 344 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
345 345
346 {$(ALTSRC)\share\vm\oops}.cpp.obj:: 346 {$(ALTSRC)\share\vm\oops}.cpp.obj::
347 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 347 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
348 348
349 {$(ALTSRC)\share\vm\prims}.cpp.obj:: 349 {$(ALTSRC)\share\vm\prims}.cpp.obj::
350 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 350 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
351 351
352 {$(ALTSRC)\share\vm\runtime}.cpp.obj:: 352 {$(ALTSRC)\share\vm\runtime}.cpp.obj::
353 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 353 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
354 354
355 {$(ALTSRC)\share\vm\services}.cpp.obj:: 355 {$(ALTSRC)\share\vm\services}.cpp.obj::
356 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 356 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
357 357
358 {$(ALTSRC)\share\vm\trace}.cpp.obj:: 358 {$(ALTSRC)\share\vm\trace}.cpp.obj::
359 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 359 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
360 360
361 {$(ALTSRC)\share\vm\utilities}.cpp.obj:: 361 {$(ALTSRC)\share\vm\utilities}.cpp.obj::
362 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 362 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
363 363
364 {$(ALTSRC)\share\vm\libadt}.cpp.obj:: 364 {$(ALTSRC)\share\vm\libadt}.cpp.obj::
365 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 365 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
366 366
367 {$(ALTSRC)\share\vm\opto}.cpp.obj:: 367 {$(ALTSRC)\share\vm\opto}.cpp.obj::
368 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 368 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
369 369
370 {$(ALTSRC)\os\windows\vm}.cpp.obj:: 370 {$(ALTSRC)\os\windows\vm}.cpp.obj::
371 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 371 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
372 372
373 # otherwise we can't specify the output filename. 373 # otherwise we can't specify the output filename.
374 {$(ALTSRC)\os\windows\vm}.rc.res: 374 {$(ALTSRC)\os\windows\vm}.rc.res:
375 @$(RC) $(RC_FLAGS) /fo"$@" $< 375 @$(RC) $(RC_FLAGS) /fo"$@" $<
376 376
377 {$(ALTSRC)\cpu\$(Platform_arch)\vm}.cpp.obj:: 377 {$(ALTSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
378 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 378 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
379 379
380 {$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj:: 380 {$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
381 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 381 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
382 382
383 {..\generated\incls}.cpp.obj:: 383 {..\generated\incls}.cpp.obj::
384 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 384 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
385 385
386 {..\generated\adfiles}.cpp.obj:: 386 {..\generated\adfiles}.cpp.obj::
387 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 387 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
388 388
389 {..\generated\jvmtifiles}.cpp.obj:: 389 {..\generated\jvmtifiles}.cpp.obj::
390 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 390 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
391 391
392 {$(ALTSRC)\share\vm\jfr}.cpp.obj:: 392 {$(ALTSRC)\share\vm\jfr}.cpp.obj::
393 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 393 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
394 394
395 {$(ALTSRC)\share\vm\jfr\agent}.cpp.obj:: 395 {$(ALTSRC)\share\vm\jfr\agent}.cpp.obj::
396 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 396 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
397 397
398 {$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj:: 398 {$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj::
399 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 399 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
400 400
401 {$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj:: 401 {$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj::
402 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 402 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
403 403
404 default:: 404 default::
405 405
406 _build_pch_file.obj: 406 _build_pch_file.obj:
407 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp 407 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp
408 $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp 408 $(CXX) $(CXX_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp