Mercurial > hg > truffle

comparison make/windows/makefiles/vm.make @ 4800:94ec88ca68e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7115199: Add event tracing hooks and Java Flight Recorder infrastructure Summary: Added a nop tracing infrastructure, JFR makefile changes and other infrastructure used only by JFR. Reviewed-by: acorn, sspitsyn Contributed-by: markus.gronlund@oracle.com
author phh
date Wed, 11 Jan 2012 17:34:02 -0500
parents 95009f678859
children 719f7007c8e8
comparison
equal deleted inserted replaced
4773:4f25538b54c9 4800:94ec88ca68e2
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 CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG"
36 !else 36 !else
37 CPP_FLAGS=$(CPP_FLAGS) /D "PRODUCT" 37 CPP_FLAGS=$(CPP_FLAGS) /D "PRODUCT"
38 !endif 38 !endif
72 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" 72 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\""
73 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 73 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
74 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 74 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
75 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 75 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
76 76
77 !ifndef JAVASE_EMBEDDED
78 CPP_FLAGS=$(CPP_FLAGS) /D "INCLUDE_TRACE"
79 !endif
80
77 CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS) 81 CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS)
78 82
79 # Define that so jni.h is on correct side 83 # Define that so jni.h is on correct side
80 CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_" 84 CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_"
81 85
95 AGCT_EXPORT=/export:AsyncGetCallTrace 99 AGCT_EXPORT=/export:AsyncGetCallTrace
96 !endif 100 !endif
97 !endif 101 !endif
98 102
99 # If you modify exports below please do the corresponding changes in 103 # If you modify exports below please do the corresponding changes in
100 # src/share/tools/ProjectCreator/WinGammaPlatformVC7.java 104 # src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
101 LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \ 105 LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
102 /export:JNI_GetDefaultJavaVMInitArgs \ 106 /export:JNI_GetDefaultJavaVMInitArgs \
103 /export:JNI_CreateJavaVM \ 107 /export:JNI_CreateJavaVM \
104 /export:JVM_FindClassFromBootLoader \ 108 /export:JVM_FindClassFromBootLoader \
105 /export:JNI_GetCreatedJavaVMs \ 109 /export:JNI_GetCreatedJavaVMs \
168 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/memory 172 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/memory
169 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/oops 173 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/oops
170 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/prims 174 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/prims
171 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/runtime 175 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/runtime
172 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/services 176 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/services
177 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/trace
173 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/utilities 178 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/utilities
174 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/libadt 179 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/libadt
175 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os/windows/vm 180 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os/windows/vm
176 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm 181 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm
177 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm 182 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm
178 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto 183 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto
179 184
185 !if exists($(ALTSRC)\share\vm\jfr)
186 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent
187 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent/isolated_deps/util
188 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/jvm
189 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr
190 !endif
191
180 VM_PATH={$(VM_PATH)} 192 VM_PATH={$(VM_PATH)}
181 193
182 # Special case files not using precompiled header files. 194 # Special case files not using precompiled header files.
183 195
184 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
259 271
260 {$(COMMONSRC)\share\vm\runtime}.cpp.obj:: 272 {$(COMMONSRC)\share\vm\runtime}.cpp.obj::
261 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 273 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
262 274
263 {$(COMMONSRC)\share\vm\services}.cpp.obj:: 275 {$(COMMONSRC)\share\vm\services}.cpp.obj::
276 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
277
278 {$(COMMONSRC)\share\vm\trace}.cpp.obj::
264 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 279 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
265 280
266 {$(COMMONSRC)\share\vm\utilities}.cpp.obj:: 281 {$(COMMONSRC)\share\vm\utilities}.cpp.obj::
267 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 282 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
268 283
338 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 353 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
339 354
340 {$(ALTSRC)\share\vm\services}.cpp.obj:: 355 {$(ALTSRC)\share\vm\services}.cpp.obj::
341 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 356 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
342 357
358 {$(ALTSRC)\share\vm\trace}.cpp.obj::
359 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
360
343 {$(ALTSRC)\share\vm\utilities}.cpp.obj:: 361 {$(ALTSRC)\share\vm\utilities}.cpp.obj::
344 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 362 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
345 363
346 {$(ALTSRC)\share\vm\libadt}.cpp.obj:: 364 {$(ALTSRC)\share\vm\libadt}.cpp.obj::
347 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 365 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
369 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 387 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
370 388
371 {..\generated\jvmtifiles}.cpp.obj:: 389 {..\generated\jvmtifiles}.cpp.obj::
372 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 390 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
373 391
392 {$(ALTSRC)\share\vm\jfr}.cpp.obj::
393 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
394
395 {$(ALTSRC)\share\vm\jfr\agent}.cpp.obj::
396 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
397
398 {$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj::
399 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
400
401 {$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj::
402 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
403
374 default:: 404 default::
375 405
376 _build_pch_file.obj: 406 _build_pch_file.obj:
377 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp 407 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp
378 $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp 408 $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp