1.1 --- a/make/linux/makefiles/vm.make Wed Oct 14 16:43:13 2020 +0800
1.2 +++ b/make/linux/makefiles/vm.make Wed Oct 14 17:44:48 2020 +0800
1.3 @@ -60,7 +60,7 @@
1.4 # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
1.5 # The adfiles directory contains ad_<arch>.[ch]pp.
1.6 # The jvmtifiles directory contains jvmti*.[ch]pp
1.7 -Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
1.8 +Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/jfrfiles
1.9 VPATH += $(Src_Dirs_V:%=%:)
1.10
1.11 # set INCLUDES for C preprocessor.
1.12 @@ -169,24 +169,21 @@
1.13 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
1.14 LIBJVM_DIZ = lib$(JVM).diz
1.15
1.16 +ifeq ($(ENABLE_JFR),false)
1.17 +EXCLUDE_JFR_PATHS:= -o -name jfr -prune
1.18 +endif
1.19 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
1.20
1.21 SOURCE_PATHS=\
1.22 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
1.23 - \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
1.24 + \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) $(EXCLUDE_JFR_PATHS) \))
1.25 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
1.26 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
1.27 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
1.28 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
1.29
1.30 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
1.31 -CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
1.32 -
1.33 -ifneq ($(INCLUDE_TRACE), false)
1.34 -CORE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
1.35 - find $(HS_ALT_SRC)/share/vm/jfr -type d; \
1.36 - fi)
1.37 -endif
1.38 +CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/jfrfiles
1.39
1.40 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
1.41 COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1
