# HG changeset patch
# User asaha
# Date 1444157893 25200
# Node ID a6f2a7ba281291f5dab79fa494f7cfaa6232c88b
# Parent  97bb3fefe6b92c607729d29e5827af6d5a682ed7# Parent  230724000e3418a56a7e6252f851d5e90ee9e88a
Merge

diff -r 97bb3fefe6b9 -r a6f2a7ba2812 .hgtags
--- a/.hgtags	Mon Sep 28 15:05:17 2015 -0700
+++ b/.hgtags	Tue Oct 06 11:58:13 2015 -0700
@@ -739,6 +739,7 @@
 ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14
 03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15
 b4137dc9b1a83409fbd2b80d2ffd5ae949cd7a6b jdk8u65-b16
+8e9c73f18f7e565f1d2100fab7cb8e9e785b1991 jdk8u65-b17
 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00
 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01
 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
diff -r 97bb3fefe6b9 -r a6f2a7ba2812 make/solaris/makefiles/buildtree.make
--- a/make/solaris/makefiles/buildtree.make	Mon Sep 28 15:05:17 2015 -0700
+++ b/make/solaris/makefiles/buildtree.make	Tue Oct 06 11:58:13 2015 -0700
@@ -265,9 +265,12 @@
 	    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"; \
 	) > $@
 
diff -r 97bb3fefe6b9 -r a6f2a7ba2812 make/solaris/makefiles/vm.make
--- a/make/solaris/makefiles/vm.make	Mon Sep 28 15:05:17 2015 -0700
+++ b/make/solaris/makefiles/vm.make	Tue Oct 06 11:58:13 2015 -0700
@@ -204,7 +204,7 @@
 ZERO_SPECIFIC_FILES      := zero
 
 # Always exclude these.
-Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
+Src_Files_EXCLUDE += dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
 
 # Exclude per type.
 Src_Files_EXCLUDE/CORE      := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp