Mercurial > hg > truffle

comparison make/windows/makefiles/vm.make @ 1983:c760f78e0a53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7003125: precompiled.hpp is included when precompiled headers are not used Summary: Added an ifndef DONT_USE_PRECOMPILED_HEADER to precompiled.hpp. Set up DONT_USE_PRECOMPILED_HEADER when compiling with Sun Studio or when the user specifies USE_PRECOMPILED_HEADER=0. Fixed broken include dependencies. Reviewed-by: coleenp, kvn
author stefank
date Wed, 01 Dec 2010 15:04:06 +0100
parents f95d63e2154a
children aa6e219afbf1
comparison
equal deleted inserted replaced
1982:6a2d73358ff7 1983:c760f78e0a53
126 /I "$(WorkSpace)\src\share\vm\prims" \ 126 /I "$(WorkSpace)\src\share\vm\prims" \
127 /I "$(WorkSpace)\src\os\windows\vm" \ 127 /I "$(WorkSpace)\src\os\windows\vm" \
128 /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \ 128 /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \
129 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" 129 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm"
130 130
131 CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
132
133 !if "$(USE_PRECOMPILED_HEADER)" != "0"
131 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" 134 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
135 !else
136 CPP_USE_PCH=$(CPP_DONT_USE_PCH)
137 !endif
132 138
133 # Where to find the source code for the virtual machine 139 # Where to find the source code for the virtual machine
134 VM_PATH=../generated 140 VM_PATH=../generated
135 VM_PATH=$(VM_PATH);../generated/adfiles 141 VM_PATH=$(VM_PATH);../generated/adfiles
136 VM_PATH=$(VM_PATH);../generated/jvmtifiles 142 VM_PATH=$(VM_PATH);../generated/jvmtifiles
162 VM_PATH={$(VM_PATH)} 168 VM_PATH={$(VM_PATH)}
163 169
164 # Special case files not using precompiled header files. 170 # Special case files not using precompiled header files.
165 171
166 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 172 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
167 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 173 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
168 174
169 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp 175 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp
170 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp 176 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
171 177
172 os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 178 os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
173 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 179 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
174 180
175 osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 181 osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
176 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 182 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
177 183
178 conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 184 conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
179 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 185 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
180 186
181 getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 187 getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
182 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 188 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
183 189
184 opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp 190 opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp
185 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp 191 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
186 192
187 bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 193 bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
188 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 194 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
189 195
190 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 196 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
191 $(CPP) $(CPP_FLAGS) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 197 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
192 198
193 # Default rules for the Virtual Machine 199 # Default rules for the Virtual Machine
194 {$(WorkSpace)\src\share\vm\c1}.cpp.obj:: 200 {$(WorkSpace)\src\share\vm\c1}.cpp.obj::
195 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 201 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
196 202