make/solaris/makefiles/buildtree.make

*** 45,55 ****
  #
  # Makefile      - for "make foo"
  # flags.make    - with macro settings
  # vm.make       - to support making "$(MAKE) -v vm.make" in makefiles
  # adlc.make     -
! # trace.make    - generate tracing event and type definitions
  # jvmti.make    - generate JVMTI bindings from the spec (JSR-163)
  # sa.make       - generate SA jar file and natives
  #
  # The makefiles are split this way so that "make foo" will run faster by not
  # having to read the dependency files for the vm.
--- 45,55 ----
  #
  # Makefile      - for "make foo"
  # flags.make    - with macro settings
  # vm.make       - to support making "$(MAKE) -v vm.make" in makefiles
  # adlc.make     -
! # jfr.make      - generate jfr event and type definitions
  # jvmti.make    - generate JVMTI bindings from the spec (JSR-163)
  # sa.make       - generate SA jar file and natives
  #
  # The makefiles are split this way so that "make foo" will run faster by not
  # having to read the dependency files for the vm.
*** 100,125 ****
  # compiler1 and core use the same exclude list
  TOPLEVEL_EXCLUDE_DIRS   = $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -name opto -o -name libadt -o -name agent
  endif
  endif
  
  # Get things from the platform file.
  COMPILER        = $(shell sed -n 's/^compiler[  ]*=[    ]*//p' $(PLATFORM_FILE))
  
  SIMPLE_DIRS     = \
          $(PLATFORM_DIR)/generated/dependencies \
          $(PLATFORM_DIR)/generated/adfiles \
          $(PLATFORM_DIR)/generated/jvmtifiles \
!         $(PLATFORM_DIR)/generated/tracefiles
  
  TARGETS      = debug fastdebug optimized product
  SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
  
  # For dependencies and recursive makes.
  BUILDTREE_MAKE  = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
  
! BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make trace.make sa.make
  
  BUILDTREE_VARS  = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
          ARCH=$(ARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
  
  # Define variables to be set in flags.make.
--- 100,129 ----
  # compiler1 and core use the same exclude list
  TOPLEVEL_EXCLUDE_DIRS   = $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -name opto -o -name libadt -o -name agent
  endif
  endif
  
+ ifeq ($(ENABLE_JFR),false)
+ ALWAYS_EXCLUDE_DIRS += -o -name jfr
+ endif
+ 
  # Get things from the platform file.
  COMPILER        = $(shell sed -n 's/^compiler[  ]*=[    ]*//p' $(PLATFORM_FILE))
  
  SIMPLE_DIRS     = \
          $(PLATFORM_DIR)/generated/dependencies \
          $(PLATFORM_DIR)/generated/adfiles \
          $(PLATFORM_DIR)/generated/jvmtifiles \
!         $(PLATFORM_DIR)/generated/jfrfiles
  
  TARGETS      = debug fastdebug optimized product
  SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
  
  # For dependencies and recursive makes.
  BUILDTREE_MAKE  = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
  
! BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make jfr.make sa.make
  
  BUILDTREE_VARS  = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
          ARCH=$(ARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
  
  # Define variables to be set in flags.make.
*** 187,196 ****
--- 191,206 ----
  DATA_MODE/sparcv9 = 64
  DATA_MODE/amd64 = 64
  
  DATA_MODE = $(DATA_MODE/$(BUILDARCH))
  
+ ifeq ($(ENABLE_JFR), true)
+   INCLUDE_JFR = 1
+ else
+   INCLUDE_JFR = 0
+ endif
+ 
  flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
          @echo Creating $@ ...
          $(QUIETLY) ( \
          $(BUILDTREE_COMMENT); \
          echo; \
*** 262,274 ****
              echo && echo "HS_ALT_MAKE = $(HS_ALT_MAKE)"; \
          [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
              echo && \
              echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
              echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
          echo; \
!         [ -n "$(INCLUDE_TRACE)" ] && \
!             echo && echo "INCLUDE_TRACE = $(INCLUDE_TRACE)"; \
          [ -n "$(SPEC)" ] && \
              echo "include $(SPEC)"; \
          echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
          echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \
          echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
--- 272,285 ----
              echo && echo "HS_ALT_MAKE = $(HS_ALT_MAKE)"; \
          [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
              echo && \
              echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
              echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
+             echo && echo "CFLAGS += -DINCLUDE_JFR=$(INCLUDE_JFR)"; \
          echo; \
!         [ -n "$(INCLUDE_JFR)" ] && \
!             echo && echo "INCLUDE_JFR = $(INCLUDE_JFR)"; \
          [ -n "$(SPEC)" ] && \
              echo "include $(SPEC)"; \
          echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
          echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \
          echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
*** 332,342 ****
          echo include flags.make; \
          echo; \
          echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
          ) > $@
  
! trace.make: $(BUILDTREE_MAKE)
          @echo Creating $@ ...
          $(QUIETLY) ( \
          $(BUILDTREE_COMMENT); \
          echo; \
          echo include flags.make; \
--- 343,353 ----
          echo include flags.make; \
          echo; \
          echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
          ) > $@
  
! jfr.make: $(BUILDTREE_MAKE)
          @echo Creating $@ ...
          $(QUIETLY) ( \
          $(BUILDTREE_COMMENT); \
          echo; \
          echo include flags.make; \