1.1 --- a/make/windows/makefiles/vm.make Thu Feb 27 19:01:32 2020 +0000
1.2 +++ b/make/windows/makefiles/vm.make Tue Mar 03 12:57:23 2020 +0000
1.3 @@ -141,7 +141,7 @@
1.4 VM_PATH=../generated
1.5 VM_PATH=$(VM_PATH);../generated/adfiles
1.6 VM_PATH=$(VM_PATH);../generated/jvmtifiles
1.7 -VM_PATH=$(VM_PATH);../generated/tracefiles
1.8 +VM_PATH=$(VM_PATH);../generated/jfrfiles
1.9 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1
1.10 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler
1.11 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code
1.12 @@ -169,11 +169,6 @@
1.13 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm
1.14 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto
1.15
1.16 -!if exists($(ALTSRC)\share\vm\jfr)
1.17 -VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr
1.18 -VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/buffers
1.19 -!endif
1.20 -
1.21 VM_PATH={$(VM_PATH)}
1.22
1.23 # Special case files not using precompiled header files.
1.24 @@ -205,6 +200,12 @@
1.25 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
1.26 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
1.27
1.28 +iphlp_interface.obj: $(WorkSpace)\src\os\windows\vm\iphlp_interface.cpp
1.29 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\iphlp_interface.cpp
1.30 +
1.31 +os_perf_windows.obj: $(WorkSpace)\src\os\windows\vm\os_perf_windows.cpp
1.32 + $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_perf_windows.cpp
1.33 +
1.34 #files compiled with version flags
1.35
1.36 vm_version.obj: $(WorkSpace)\src\share\vm\runtime\vm_version.cpp
1.37 @@ -388,13 +389,79 @@
1.38 {..\generated\jvmtifiles}.cpp.obj::
1.39 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.40
1.41 -{..\generated\tracefiles}.cpp.obj::
1.42 +{..\generated\jfrfiles}.cpp.obj::
1.43 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.44
1.45 -{$(ALTSRC)\share\vm\jfr}.cpp.obj::
1.46 +{$(COMMONSRC)\share\vm\jfr}.cpp.obj::
1.47 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.48
1.49 -{$(ALTSRC)\share\vm\jfr\buffers}.cpp.obj::
1.50 +{$(COMMONSRC)\share\vm\jfr\dcmd}.cpp.obj::
1.51 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.52 +
1.53 +{$(COMMONSRC)\share\vm\jfr\instrumentation}.cpp.obj::
1.54 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.55 +
1.56 +{$(COMMONSRC)\share\vm\jfr\jni}.cpp.obj::
1.57 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.58 +
1.59 +{$(COMMONSRC)\share\vm\jfr\leakprofiler}.cpp.obj::
1.60 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.61 +
1.62 +{$(COMMONSRC)\share\vm\jfr\leakprofiler\chains}.cpp.obj::
1.63 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.64 +
1.65 +{$(COMMONSRC)\share\vm\jfr\leakprofiler\checkpoint}.cpp.obj::
1.66 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.67 +
1.68 +{$(COMMONSRC)\share\vm\jfr\leakprofiler\sampling}.cpp.obj::
1.69 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.70 +
1.71 +{$(COMMONSRC)\share\vm\jfr\leakprofiler\utilities}.cpp.obj::
1.72 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.73 +
1.74 +{$(COMMONSRC)\share\vm\jfr\metadata}.cpp.obj::
1.75 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.76 +
1.77 +{$(COMMONSRC)\share\vm\jfr\periodic}.cpp.obj::
1.78 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.79 +
1.80 +{$(COMMONSRC)\share\vm\jfr\periodic\sampling}.cpp.obj::
1.81 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.82 +
1.83 +{$(COMMONSRC)\share\vm\jfr\recorder}.cpp.obj::
1.84 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.85 +
1.86 +{$(COMMONSRC)\share\vm\jfr\recorder\checkpoint}.cpp.obj::
1.87 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.88 +
1.89 +{$(COMMONSRC)\share\vm\jfr\recorder\checkpoint\types}.cpp.obj::
1.90 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.91 +
1.92 +{$(COMMONSRC)\share\vm\jfr\recorder\checkpoint\types\traceid}.cpp.obj::
1.93 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.94 +
1.95 +{$(COMMONSRC)\share\vm\jfr\recorder\repository}.cpp.obj::
1.96 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.97 +
1.98 +{$(COMMONSRC)\share\vm\jfr\recorder\service}.cpp.obj::
1.99 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.100 +
1.101 +{$(COMMONSRC)\share\vm\jfr\recorder\stacktrace}.cpp.obj::
1.102 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.103 +
1.104 +{$(COMMONSRC)\share\vm\jfr\recorder\storage}.cpp.obj::
1.105 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.106 +
1.107 +{$(COMMONSRC)\share\vm\jfr\recorder\stringpool}.cpp.obj::
1.108 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.109 +
1.110 +{$(COMMONSRC)\share\vm\jfr\support}.cpp.obj::
1.111 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.112 +
1.113 +{$(COMMONSRC)\share\vm\jfr\utilities}.cpp.obj::
1.114 + $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.115 +
1.116 +{$(COMMONSRC)\share\vm\jfr\writers}.cpp.obj::
1.117 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
1.118
1.119 default::
