8075236: Change layout of gcov .gcno files in symbols image

Reviewed-by: ihse, tbell
This commit is contained in:
Erik Joelsson 2015-03-17 14:16:30 +01:00
parent e193e0c6a3
commit 207dec2e01

View File

@ -494,29 +494,16 @@ ifeq ($(GCOV_ENABLED), true)
GCOV_FIND_EXPR := -type f -name "*.gcno" GCOV_FIND_EXPR := -type f -name "*.gcno"
ifeq ($(JVM_VARIANT_CLIENT), true) $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \
$(eval $(call SetupCopyFiles,COPY_HOTSPOT_CLIENT_GCOV_GCNO, \ SRC := $(OUTPUT_ROOT), \
SRC := $(HOTSPOT_OUTPUTDIR), \ DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/client, \ FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR))))
FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler1/ $(GCOV_FIND_EXPR)), \
FLATTEN := true))
SYMBOLS_TARGETS += $(COPY_HOTSPOT_CLIENT_GCOV_GCNO) SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO)
endif
ifeq ($(JVM_VARIANT_SERVER), true)
$(eval $(call SetupCopyFiles,COPY_HOTSPOT_SERVER_GCOV_GCNO, \
SRC := $(HOTSPOT_OUTPUTDIR), \
DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/server, \
FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler2/ $(GCOV_FIND_EXPR)), \
FLATTEN := true))
SYMBOLS_TARGETS += $(COPY_HOTSPOT_SERVER_GCOV_GCNO)
endif
$(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \ $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
SRC := $(SUPPORT_OUTPUTDIR)/native, \ SRC := $(OUTPUT_ROOT), \
DEST := $(SYMBOLS_IMAGE_DIR)/gcov/jdk, \ DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR)))) FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO) SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)