1.1 --- a/make/linux/makefiles/buildtree.make Thu Aug 01 03:44:03 2019 +0100
1.2 +++ b/make/linux/makefiles/buildtree.make Mon Aug 12 18:30:40 2019 +0300
1.3 @@ -48,7 +48,7 @@
1.4 # flags.make - with macro settings
1.5 # vm.make - to support making "$(MAKE) -v vm.make" in makefiles
1.6 # adlc.make -
1.7 -# trace.make - generate tracing event and type definitions
1.8 +# jfr.make - generate jfr event and type definitions
1.9 # jvmti.make - generate JVMTI bindings from the spec (JSR-163)
1.10 # sa.make - generate SA jar file and natives
1.11 #
1.12 @@ -112,6 +112,10 @@
1.13 endif
1.14 endif
1.15
1.16 +ifeq ($(ENABLE_JFR),false)
1.17 +ALWAYS_EXCLUDE_DIRS += -o -name jfr
1.18 +endif
1.19 +
1.20 # Get things from the platform file.
1.21 COMPILER = $(shell sed -n 's/^compiler[ ]*=[ ]*//p' $(PLATFORM_FILE))
1.22
1.23 @@ -119,7 +123,7 @@
1.24 $(PLATFORM_DIR)/generated/dependencies \
1.25 $(PLATFORM_DIR)/generated/adfiles \
1.26 $(PLATFORM_DIR)/generated/jvmtifiles \
1.27 - $(PLATFORM_DIR)/generated/tracefiles
1.28 + $(PLATFORM_DIR)/generated/jfrfiles
1.29
1.30 TARGETS = debug fastdebug optimized product
1.31 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
1.32 @@ -127,7 +131,7 @@
1.33 # For dependencies and recursive makes.
1.34 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
1.35
1.36 -BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make trace.make sa.make
1.37 +BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make jfr.make sa.make
1.38
1.39 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
1.40 SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
1.41 @@ -200,6 +204,13 @@
1.42
1.43 DATA_MODE = $(DATA_MODE/$(BUILDARCH))
1.44
1.45 +ifeq ($(ENABLE_JFR), true)
1.46 + INCLUDE_JFR = 1
1.47 +else
1.48 + INCLUDE_JFR = 0
1.49 +endif
1.50 +
1.51 +
1.52 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
1.53 @echo Creating $@ ...
1.54 $(QUIETLY) ( \
1.55 @@ -279,8 +290,7 @@
1.56 echo && \
1.57 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
1.58 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
1.59 - [ -n "$(INCLUDE_TRACE)" ] && \
1.60 - echo && echo "INCLUDE_TRACE = $(INCLUDE_TRACE)"; \
1.61 + echo && echo "CFLAGS += -DINCLUDE_JFR=$(INCLUDE_JFR)"; \
1.62 echo; \
1.63 [ -n "$(SPEC)" ] && \
1.64 echo "include $(SPEC)"; \
1.65 @@ -349,7 +359,7 @@
1.66 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
1.67 ) > $@
1.68
1.69 -trace.make: $(BUILDTREE_MAKE)
1.70 +jfr.make: $(BUILDTREE_MAKE)
1.71 @echo Creating $@ ...
1.72 $(QUIETLY) ( \
1.73 $(BUILDTREE_COMMENT); \
