1.1 --- a/make/windows/makefiles/vm.make Tue Jan 31 13:12:39 2012 +0100
1.2 +++ b/make/windows/makefiles/vm.make Mon Feb 06 09:14:22 2012 +0100
1.3 @@ -32,12 +32,12 @@
1.4
1.5 !ifdef RELEASE
1.6 !ifdef DEVELOP
1.7 -CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG"
1.8 +CXX_FLAGS=$(CXX_FLAGS) /D "DEBUG"
1.9 !else
1.10 -CPP_FLAGS=$(CPP_FLAGS) /D "PRODUCT"
1.11 +CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT"
1.12 !endif
1.13 !else
1.14 -CPP_FLAGS=$(CPP_FLAGS) /D "ASSERT"
1.15 +CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT"
1.16 !endif
1.17
1.18 !if "$(Variant)" == "core"
1.19 @@ -45,19 +45,19 @@
1.20 !endif
1.21
1.22 !if "$(Variant)" == "kernel"
1.23 -CPP_FLAGS=$(CPP_FLAGS) /D "KERNEL"
1.24 +CXX_FLAGS=$(CXX_FLAGS) /D "KERNEL"
1.25 !endif
1.26
1.27 !if "$(Variant)" == "compiler1"
1.28 -CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1"
1.29 +CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1"
1.30 !endif
1.31
1.32 !if "$(Variant)" == "compiler2"
1.33 -CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER2"
1.34 +CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER2"
1.35 !endif
1.36
1.37 !if "$(Variant)" == "tiered"
1.38 -CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "COMPILER2"
1.39 +CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" /D "COMPILER2"
1.40 !endif
1.41
1.42 !if "$(BUILDARCH)" == "i486"
1.43 @@ -67,21 +67,21 @@
1.44 !endif
1.45
1.46 # The following variables are defined in the generated local.make file.
1.47 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\""
1.48 -CPP_FLAGS=$(CPP_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\""
1.49 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\""
1.50 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
1.51 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
1.52 -CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
1.53 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\""
1.54 +CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\""
1.55 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\""
1.56 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
1.57 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
1.58 +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
1.59
1.60 !ifndef JAVASE_EMBEDDED
1.61 -CPP_FLAGS=$(CPP_FLAGS) /D "INCLUDE_TRACE"
1.62 +CXX_FLAGS=$(CXX_FLAGS) /D "INCLUDE_TRACE"
1.63 !endif
1.64
1.65 -CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS)
1.66 +CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS)
1.67
1.68 # Define that so jni.h is on correct side
1.69 -CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_"
1.70 +CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_"
1.71
1.72 !if "$(BUILDARCH)" == "ia64"
1.73 STACK_SIZE="/STACK:1048576,262144"
1.74 @@ -102,7 +102,7 @@
1.75
1.76 # If you modify exports below please do the corresponding changes in
1.77 # src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
1.78 -LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
1.79 +LD_FLAGS=$(LD_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
1.80 /export:JNI_GetDefaultJavaVMInitArgs \
1.81 /export:JNI_CreateJavaVM \
1.82 /export:JVM_FindClassFromBootLoader \
1.83 @@ -118,25 +118,25 @@
1.84 /export:JVM_GetThreadStateValues \
1.85 /export:JVM_InitAgentProperties
1.86
1.87 -CPP_INCLUDE_DIRS=/I "..\generated"
1.88 +CXX_INCLUDE_DIRS=/I "..\generated"
1.89
1.90 !if exists($(ALTSRC)\share\vm)
1.91 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm"
1.92 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm"
1.93 !endif
1.94
1.95 !if exists($(ALTSRC)\os\windows\vm)
1.96 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm"
1.97 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm"
1.98 !endif
1.99
1.100 !if exists($(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm)
1.101 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm"
1.102 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm"
1.103 !endif
1.104
1.105 !if exists($(ALTSRC)\cpu\$(Platform_arch)\vm)
1.106 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm"
1.107 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm"
1.108 !endif
1.109
1.110 -CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) \
1.111 +CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) \
1.112 /I "$(COMMONSRC)\share\vm" \
1.113 /I "$(COMMONSRC)\share\vm\precompiled" \
1.114 /I "$(COMMONSRC)\share\vm\prims" \
1.115 @@ -144,12 +144,12 @@
1.116 /I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \
1.117 /I "$(COMMONSRC)\cpu\$(Platform_arch)\vm"
1.118
1.119 -CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
1.120 +CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
1.121
1.122 !if "$(USE_PRECOMPILED_HEADER)" != "0"
1.123 -CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
1.124 +CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
1.125 !else
1.126 -CPP_USE_PCH=$(CPP_DONT_USE_PCH)
1.127 +CXX_USE_PCH=$(CXX_DONT_USE_PCH)
1.128 !endif
1.129
1.130 # Where to find the source code for the virtual machine (is this used?)
1.131 @@ -194,101 +194,101 @@
1.132 # Special case files not using precompiled header files.
1.133
1.134 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
1.135 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
1.136 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
1.137
1.138 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp
1.139 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
1.140 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
1.141
1.142 os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
1.143 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
1.144 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
1.145
1.146 osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
1.147 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
1.148 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
1.149
1.150 conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
1.151 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
1.152 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
1.153
1.154 getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
1.155 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
1.156 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
1.157
1.158 opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp
1.159 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
1.160 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
1.161
1.162 bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
1.163 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
1.164 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
1.165
1.166 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
1.167 - $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
1.168 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
1.169
1.170 # Default rules for the Virtual Machine
1.171 {$(COMMONSRC)\share\vm\c1}.cpp.obj::
1.172 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.173 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.174
1.175 {$(COMMONSRC)\share\vm\compiler}.cpp.obj::
1.176 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.177 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.178
1.179 {$(COMMONSRC)\share\vm\code}.cpp.obj::
1.180 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.181 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.182
1.183 {$(COMMONSRC)\share\vm\interpreter}.cpp.obj::
1.184 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.185 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.186
1.187 {$(COMMONSRC)\share\vm\ci}.cpp.obj::
1.188 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.189 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.190
1.191 {$(COMMONSRC)\share\vm\classfile}.cpp.obj::
1.192 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.193 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.194
1.195 {$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
1.196 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.197 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.198
1.199 {$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj::
1.200 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.201 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.202
1.203 {$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
1.204 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.205 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.206
1.207 {$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
1.208 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.209 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.210
1.211 {$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj::
1.212 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.213 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.214
1.215 {$(COMMONSRC)\share\vm\gc_interface}.cpp.obj::
1.216 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.217 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.218
1.219 {$(COMMONSRC)\share\vm\asm}.cpp.obj::
1.220 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.221 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.222
1.223 {$(COMMONSRC)\share\vm\memory}.cpp.obj::
1.224 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.225 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.226
1.227 {$(COMMONSRC)\share\vm\oops}.cpp.obj::
1.228 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.229 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.230
1.231 {$(COMMONSRC)\share\vm\prims}.cpp.obj::
1.232 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.233 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.234
1.235 {$(COMMONSRC)\share\vm\runtime}.cpp.obj::
1.236 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.237 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.238
1.239 {$(COMMONSRC)\share\vm\services}.cpp.obj::
1.240 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.241 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.242
1.243 {$(COMMONSRC)\share\vm\trace}.cpp.obj::
1.244 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.245 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.246
1.247 {$(COMMONSRC)\share\vm\utilities}.cpp.obj::
1.248 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.249 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.250
1.251 {$(COMMONSRC)\share\vm\libadt}.cpp.obj::
1.252 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.253 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.254
1.255 {$(COMMONSRC)\share\vm\opto}.cpp.obj::
1.256 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.257 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.258
1.259 {$(COMMONSRC)\os\windows\vm}.cpp.obj::
1.260 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.261 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.262
1.263 # This guy should remain a single colon rule because
1.264 # otherwise we can't specify the output filename.
1.265 @@ -296,113 +296,113 @@
1.266 @$(RC) $(RC_FLAGS) /fo"$@" $<
1.267
1.268 {$(COMMONSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
1.269 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.270 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.271
1.272 {$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
1.273 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.274 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.275
1.276 {$(ALTSRC)\share\vm\c1}.cpp.obj::
1.277 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.278 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.279
1.280 {$(ALTSRC)\share\vm\compiler}.cpp.obj::
1.281 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.282 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.283
1.284 {$(ALTSRC)\share\vm\code}.cpp.obj::
1.285 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.286 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.287
1.288 {$(ALTSRC)\share\vm\interpreter}.cpp.obj::
1.289 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.290 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.291
1.292 {$(ALTSRC)\share\vm\ci}.cpp.obj::
1.293 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.294 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.295
1.296 {$(ALTSRC)\share\vm\classfile}.cpp.obj::
1.297 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.298 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.299
1.300 {$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
1.301 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.302 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.303
1.304 {$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj::
1.305 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.306 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.307
1.308 {$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
1.309 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.310 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.311
1.312 {$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
1.313 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.314 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.315
1.316 {$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj::
1.317 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.318 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.319
1.320 {$(ALTSRC)\share\vm\gc_interface}.cpp.obj::
1.321 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.322 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.323
1.324 {$(ALTSRC)\share\vm\asm}.cpp.obj::
1.325 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.326 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.327
1.328 {$(ALTSRC)\share\vm\memory}.cpp.obj::
1.329 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.330 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.331
1.332 {$(ALTSRC)\share\vm\oops}.cpp.obj::
1.333 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.334 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.335
1.336 {$(ALTSRC)\share\vm\prims}.cpp.obj::
1.337 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.338 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.339
1.340 {$(ALTSRC)\share\vm\runtime}.cpp.obj::
1.341 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.342 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.343
1.344 {$(ALTSRC)\share\vm\services}.cpp.obj::
1.345 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.346 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.347
1.348 {$(ALTSRC)\share\vm\trace}.cpp.obj::
1.349 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.350 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.351
1.352 {$(ALTSRC)\share\vm\utilities}.cpp.obj::
1.353 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.354 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.355
1.356 {$(ALTSRC)\share\vm\libadt}.cpp.obj::
1.357 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.358 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.359
1.360 {$(ALTSRC)\share\vm\opto}.cpp.obj::
1.361 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.362 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.363
1.364 {$(ALTSRC)\os\windows\vm}.cpp.obj::
1.365 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.366 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.367
1.368 # otherwise we can't specify the output filename.
1.369 {$(ALTSRC)\os\windows\vm}.rc.res:
1.370 @$(RC) $(RC_FLAGS) /fo"$@" $<
1.371
1.372 {$(ALTSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
1.373 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.374 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.375
1.376 {$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
1.377 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.378 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.379
1.380 {..\generated\incls}.cpp.obj::
1.381 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.382 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.383
1.384 {..\generated\adfiles}.cpp.obj::
1.385 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.386 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.387
1.388 {..\generated\jvmtifiles}.cpp.obj::
1.389 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.390 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.391
1.392 {$(ALTSRC)\share\vm\jfr}.cpp.obj::
1.393 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.394 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.395
1.396 {$(ALTSRC)\share\vm\jfr\agent}.cpp.obj::
1.397 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.398 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.399
1.400 {$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj::
1.401 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.402 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.403
1.404 {$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj::
1.405 - $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.406 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.407
1.408 default::
1.409
1.410 _build_pch_file.obj:
1.411 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp
1.412 - $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp
1.413 + $(CXX) $(CXX_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp
