Mercurial > hg > truffle

comparison make/windows/makefiles/vm.make @ 2199:d8a72fbc4be7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7003401: Implement VM error-reporting functionality on erroneous termination Summary: Add support for distribution-specific error reporting Reviewed-by: coleenp, phh, jcoomes, ohair
author kamg
date Tue, 08 Feb 2011 17:20:45 -0500
parents aa6e219afbf1
children 0cd39a385a72 1d1603768966
comparison
equal deleted inserted replaced
2197:5e139f767ddb 2199:d8a72fbc4be7
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
30 COMMONSRC=$(WorkSpace)\src
31 ALTSRC=$(WorkSpace)\src\closed
29 32
30 !ifdef RELEASE 33 !ifdef RELEASE
31 !ifdef DEVELOP 34 !ifdef DEVELOP
32 CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG" 35 CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG"
33 !else 36 !else
109 /export:JVM_GetVersionInfo \ 112 /export:JVM_GetVersionInfo \
110 /export:JVM_GetThreadStateNames \ 113 /export:JVM_GetThreadStateNames \
111 /export:JVM_GetThreadStateValues \ 114 /export:JVM_GetThreadStateValues \
112 /export:JVM_InitAgentProperties 115 /export:JVM_InitAgentProperties
113 116
114 CPP_INCLUDE_DIRS=\ 117 CPP_INCLUDE_DIRS=/I "..\generated"
115 /I "..\generated" \ 118
116 /I "$(WorkSpace)\src\share\vm" \ 119 !if exists($(ALTSRC)\share\vm)
117 /I "$(WorkSpace)\src\share\vm\prims" \ 120 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm"
118 /I "$(WorkSpace)\src\os\windows\vm" \ 121 !endif
119 /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \ 122
120 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" 123 !if exists($(ALTSRC)\os\windows\vm)
124 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm"
125 !endif
126
127 !if exists($(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm)
128 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm"
129 !endif
130
131 !if exists($(ALTSRC)\cpu\$(Platform_arch)\vm)
132 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm"
133 !endif
134
135 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) \
136 /I "$(COMMONSRC)\share\vm" \
137 /I "$(COMMONSRC)\share\vm\prims" \
138 /I "$(COMMONSRC)\os\windows\vm" \
139 /I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \
140 /I "$(COMMONSRC)\cpu\$(Platform_arch)\vm"
121 141
122 CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER 142 CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
123 143
124 !if "$(USE_PRECOMPILED_HEADER)" != "0" 144 !if "$(USE_PRECOMPILED_HEADER)" != "0"
125 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" 145 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
126 !else 146 !else
127 CPP_USE_PCH=$(CPP_DONT_USE_PCH) 147 CPP_USE_PCH=$(CPP_DONT_USE_PCH)
128 !endif 148 !endif
129 149
130 # Where to find the source code for the virtual machine 150 # Where to find the source code for the virtual machine (is this used?)
131 VM_PATH=../generated 151 VM_PATH=../generated
132 VM_PATH=$(VM_PATH);../generated/adfiles 152 VM_PATH=$(VM_PATH);../generated/adfiles
133 VM_PATH=$(VM_PATH);../generated/jvmtifiles 153 VM_PATH=$(VM_PATH);../generated/jvmtifiles
134 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1 154 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1
135 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler 155 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler
186 206
187 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 207 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
188 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 208 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
189 209
190 # Default rules for the Virtual Machine 210 # Default rules for the Virtual Machine
191 {$(WorkSpace)\src\share\vm\c1}.cpp.obj:: 211 {$(COMMONSRC)\share\vm\c1}.cpp.obj::
192 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 212 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
193 213
194 {$(WorkSpace)\src\share\vm\compiler}.cpp.obj:: 214 {$(COMMONSRC)\share\vm\compiler}.cpp.obj::
195 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 215 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
196 216
197 {$(WorkSpace)\src\share\vm\code}.cpp.obj:: 217 {$(COMMONSRC)\share\vm\code}.cpp.obj::
198 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 218 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
199 219
200 {$(WorkSpace)\src\share\vm\interpreter}.cpp.obj:: 220 {$(COMMONSRC)\share\vm\interpreter}.cpp.obj::
201 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 221 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
202 222
203 {$(WorkSpace)\src\share\vm\ci}.cpp.obj:: 223 {$(COMMONSRC)\share\vm\ci}.cpp.obj::
204 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 224 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
205 225
206 {$(WorkSpace)\src\share\vm\classfile}.cpp.obj:: 226 {$(COMMONSRC)\share\vm\classfile}.cpp.obj::
207 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 227 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
208 228
209 {$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: 229 {$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
210 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 230 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
211 231
212 {$(WorkSpace)\src\share\vm\gc_implementation\shared}.cpp.obj:: 232 {$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj::
213 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 233 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
214 234
215 {$(WorkSpace)\src\share\vm\gc_implementation\parNew}.cpp.obj:: 235 {$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
216 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 236 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
217 237
218 {$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: 238 {$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
219 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 239 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
220 240
221 {$(WorkSpace)\src\share\vm\gc_implementation\g1}.cpp.obj:: 241 {$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj::
222 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 242 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
223 243
224 {$(WorkSpace)\src\share\vm\gc_interface}.cpp.obj:: 244 {$(COMMONSRC)\share\vm\gc_interface}.cpp.obj::
225 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 245 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
226 246
227 {$(WorkSpace)\src\share\vm\asm}.cpp.obj:: 247 {$(COMMONSRC)\share\vm\asm}.cpp.obj::
228 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 248 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
229 249
230 {$(WorkSpace)\src\share\vm\memory}.cpp.obj:: 250 {$(COMMONSRC)\share\vm\memory}.cpp.obj::
231 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 251 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
232 252
233 {$(WorkSpace)\src\share\vm\oops}.cpp.obj:: 253 {$(COMMONSRC)\share\vm\oops}.cpp.obj::
234 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 254 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
235 255
236 {$(WorkSpace)\src\share\vm\prims}.cpp.obj:: 256 {$(COMMONSRC)\share\vm\prims}.cpp.obj::
237 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 257 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
238 258
239 {$(WorkSpace)\src\share\vm\runtime}.cpp.obj:: 259 {$(COMMONSRC)\share\vm\runtime}.cpp.obj::
240 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 260 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
241 261
242 {$(WorkSpace)\src\share\vm\services}.cpp.obj:: 262 {$(COMMONSRC)\share\vm\services}.cpp.obj::
243 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 263 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
244 264
245 {$(WorkSpace)\src\share\vm\utilities}.cpp.obj:: 265 {$(COMMONSRC)\share\vm\utilities}.cpp.obj::
246 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 266 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
247 267
248 {$(WorkSpace)\src\share\vm\libadt}.cpp.obj:: 268 {$(COMMONSRC)\share\vm\libadt}.cpp.obj::
249 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 269 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
250 270
251 {$(WorkSpace)\src\share\vm\opto}.cpp.obj:: 271 {$(COMMONSRC)\share\vm\opto}.cpp.obj::
252 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 272 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
253 273
254 {$(WorkSpace)\src\os\windows\vm}.cpp.obj:: 274 {$(COMMONSRC)\os\windows\vm}.cpp.obj::
255 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 275 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
256 276
257 # This guy should remain a single colon rule because 277 # This guy should remain a single colon rule because
258 # otherwise we can't specify the output filename. 278 # otherwise we can't specify the output filename.
259 {$(WorkSpace)\src\os\windows\vm}.rc.res: 279 {$(COMMONSRC)\os\windows\vm}.rc.res:
260 @$(RC) $(RC_FLAGS) /fo"$@" $< 280 @$(RC) $(RC_FLAGS) /fo"$@" $<
261 281
262 {$(WorkSpace)\src\cpu\$(Platform_arch)\vm}.cpp.obj:: 282 {$(COMMONSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
263 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 283 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
264 284
265 {$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj:: 285 {$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
286 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
287
288 {$(ALTSRC)\share\vm\c1}.cpp.obj::
289 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
290
291 {$(ALTSRC)\share\vm\compiler}.cpp.obj::
292 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
293
294 {$(ALTSRC)\share\vm\code}.cpp.obj::
295 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
296
297 {$(ALTSRC)\share\vm\interpreter}.cpp.obj::
298 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
299
300 {$(ALTSRC)\share\vm\ci}.cpp.obj::
301 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
302
303 {$(ALTSRC)\share\vm\classfile}.cpp.obj::
304 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
305
306 {$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
307 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
308
309 {$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj::
310 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
311
312 {$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
313 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
314
315 {$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
316 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
317
318 {$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj::
319 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
320
321 {$(ALTSRC)\share\vm\gc_interface}.cpp.obj::
322 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
323
324 {$(ALTSRC)\share\vm\asm}.cpp.obj::
325 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
326
327 {$(ALTSRC)\share\vm\memory}.cpp.obj::
328 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
329
330 {$(ALTSRC)\share\vm\oops}.cpp.obj::
331 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
332
333 {$(ALTSRC)\share\vm\prims}.cpp.obj::
334 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
335
336 {$(ALTSRC)\share\vm\runtime}.cpp.obj::
337 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
338
339 {$(ALTSRC)\share\vm\services}.cpp.obj::
340 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
341
342 {$(ALTSRC)\share\vm\utilities}.cpp.obj::
343 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
344
345 {$(ALTSRC)\share\vm\libadt}.cpp.obj::
346 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
347
348 {$(ALTSRC)\share\vm\opto}.cpp.obj::
349 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
350
351 {$(ALTSRC)\os\windows\vm}.cpp.obj::
352 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
353
354 # otherwise we can't specify the output filename.
355 {$(ALTSRC)\os\windows\vm}.rc.res:
356 @$(RC) $(RC_FLAGS) /fo"$@" $<
357
358 {$(ALTSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
359 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
360
361 {$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
266 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 362 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
267 363
268 {..\generated\incls}.cpp.obj:: 364 {..\generated\incls}.cpp.obj::
269 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 365 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
270 366