1.1 --- a/make/aix/makefiles/buildtree.make Wed Apr 15 15:19:07 2020 +0200
1.2 +++ b/make/aix/makefiles/buildtree.make Tue Apr 21 12:03:29 2020 +0200
1.3 @@ -1,6 +1,6 @@
1.4 #
1.5 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 -# Copyright 2012, 2013 SAP AG. All rights reserved.
1.7 +# Copyright (c) 2012, 2020 SAP SE. All rights reserved.
1.8 # Copyright 2019 Red Hat, Inc.
1.9 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.10 #
1.11 @@ -49,7 +49,7 @@
1.12 # flags.make - with macro settings
1.13 # vm.make - to support making "$(MAKE) -v vm.make" in makefiles
1.14 # adlc.make -
1.15 -# trace.make - generate tracing event and type definitions
1.16 +# jfr.make - generate jfr event and type definitions
1.17 # jvmti.make - generate JVMTI bindings from the spec (JSR-163)
1.18 # sa.make - generate SA jar file and natives
1.19 #
1.20 @@ -111,6 +111,10 @@
1.21 endif
1.22 endif
1.23
1.24 +ifeq ($(ENABLE_JFR),false)
1.25 +ALWAYS_EXCLUDE_DIRS += -o -name jfr
1.26 +endif
1.27 +
1.28 # Get things from the platform file.
1.29 COMPILER = $(shell sed -n 's/^compiler[ ]*=[ ]*//p' $(PLATFORM_FILE))
1.30
1.31 @@ -118,7 +122,7 @@
1.32 $(PLATFORM_DIR)/generated/dependencies \
1.33 $(PLATFORM_DIR)/generated/adfiles \
1.34 $(PLATFORM_DIR)/generated/jvmtifiles \
1.35 - $(PLATFORM_DIR)/generated/tracefiles
1.36 + $(PLATFORM_DIR)/generated/jfrfiles
1.37
1.38 TARGETS = debug fastdebug optimized product
1.39 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
1.40 @@ -126,7 +130,7 @@
1.41 # For dependencies and recursive makes.
1.42 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
1.43
1.44 -BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make trace.make sa.make
1.45 +BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make jfr.make sa.make
1.46
1.47 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
1.48 SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
1.49 @@ -195,6 +199,12 @@
1.50
1.51 DATA_MODE = $(DATA_MODE/$(BUILDARCH))
1.52
1.53 +ifeq ($(ENABLE_JFR), true)
1.54 + INCLUDE_JFR = 1
1.55 +else
1.56 + INCLUDE_JFR = 0
1.57 +endif
1.58 +
1.59 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
1.60 @echo Creating $@ ...
1.61 $(QUIETLY) ( \
1.62 @@ -274,8 +284,7 @@
1.63 echo && \
1.64 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
1.65 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
1.66 - [ -n "$(INCLUDE_TRACE)" ] && \
1.67 - echo && echo "INCLUDE_TRACE = $(INCLUDE_TRACE)"; \
1.68 + echo && echo "CFLAGS += -DINCLUDE_JFR=$(INCLUDE_JFR)"; \
1.69 echo; \
1.70 [ -n "$(SPEC)" ] && \
1.71 echo "include $(SPEC)"; \
1.72 @@ -344,7 +353,7 @@
1.73 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
1.74 ) > $@
1.75
1.76 -trace.make: $(BUILDTREE_MAKE)
1.77 +jfr.make: $(BUILDTREE_MAKE)
1.78 @echo Creating $@ ...
1.79 $(QUIETLY) ( \
1.80 $(BUILDTREE_COMMENT); \
