Mercurial > hg > truffle

comparison make/windows/makefiles/vm.make @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 43223d3f5dcd f2110083203d
children 6b0fd0964b87
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
67 CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" 67 CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\""
68 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" 68 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\""
69 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 69 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
70 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 70 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
71 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 71 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
72
73 !ifndef JAVASE_EMBEDDED
74 CXX_FLAGS=$(CXX_FLAGS) /D "INCLUDE_TRACE"
75 !endif
76 72
77 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS) 73 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS)
78 74
79 # Define that so jni.h is on correct side 75 # Define that so jni.h is on correct side
80 CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_" 76 CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_"
146 142
147 # Where to find the source code for the virtual machine (is this used?) 143 # Where to find the source code for the virtual machine (is this used?)
148 VM_PATH=../generated 144 VM_PATH=../generated
149 VM_PATH=$(VM_PATH);../generated/adfiles 145 VM_PATH=$(VM_PATH);../generated/adfiles
150 VM_PATH=$(VM_PATH);../generated/jvmtifiles 146 VM_PATH=$(VM_PATH);../generated/jvmtifiles
147 VM_PATH=$(VM_PATH);../generated/tracefiles
151 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1 148 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1
152 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/graal 149 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/graal
153 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler 150 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler
154 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code 151 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code
155 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter 152 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter
175 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm 172 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm
176 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm 173 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm
177 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto 174 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto
178 175
179 !if exists($(ALTSRC)\share\vm\jfr) 176 !if exists($(ALTSRC)\share\vm\jfr)
180 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent
181 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent/isolated_deps/util
182 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/jvm
183 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr 177 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr
178 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/buffers
184 !endif 179 !endif
185 180
186 VM_PATH={$(VM_PATH)} 181 VM_PATH={$(VM_PATH)}
187 182
188 # Special case files not using precompiled header files. 183 # Special case files not using precompiled header files.
387 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 382 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
388 383
389 {..\generated\jvmtifiles}.cpp.obj:: 384 {..\generated\jvmtifiles}.cpp.obj::
390 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 385 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
391 386
387 {..\generated\tracefiles}.cpp.obj::
388 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
389
392 {$(ALTSRC)\share\vm\jfr}.cpp.obj:: 390 {$(ALTSRC)\share\vm\jfr}.cpp.obj::
393 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 391 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
394 392
395 {$(ALTSRC)\share\vm\jfr\agent}.cpp.obj:: 393 {$(ALTSRC)\share\vm\jfr\buffers}.cpp.obj::
396 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
397
398 {$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj::
399 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
400
401 {$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj::
402 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< 394 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
403 395
404 default:: 396 default::
405 397
406 _build_pch_file.obj: 398 _build_pch_file.obj: