# HG changeset patch
# User asaha
# Date 1444850178 25200
# Node ID 7466029bf3cd3d5eea3055c4f790728263be4a2e
# Parent  c0242ea4bde19d72be5149feda112a39e8c89b0a# Parent  d8be40462cfb6de441818aec8c30e03077189010
Merge

diff -r c0242ea4bde1 -r 7466029bf3cd .hgtags
--- a/.hgtags	Mon Oct 12 12:34:13 2015 -0700
+++ b/.hgtags	Wed Oct 14 12:16:18 2015 -0700
@@ -744,6 +744,7 @@
 ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14
 03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15
 b4137dc9b1a83409fbd2b80d2ffd5ae949cd7a6b jdk8u65-b16
+8e9c73f18f7e565f1d2100fab7cb8e9e785b1991 jdk8u65-b17
 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00
 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01
 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
@@ -759,6 +760,8 @@
 9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14
 5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15
 4bbf0e9196f2786e0bc4f17664e2533808d944bf jdk8u66-b16
+a6f2a7ba281291f5dab79fa494f7cfaa6232c88b jdk8u66-b17
+527f62b70faee4a0c15f365def024b87012e6934 jdk8u66-b31
 9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00
 67df26e363fb7e722032fd286673642fc999957c jdk8u71-b01
 1a799d49de23d84f658ade1d3805a1924e7e1e84 jdk8u71-b02
diff -r c0242ea4bde1 -r 7466029bf3cd make/solaris/makefiles/buildtree.make
--- a/make/solaris/makefiles/buildtree.make	Mon Oct 12 12:34:13 2015 -0700
+++ b/make/solaris/makefiles/buildtree.make	Wed Oct 14 12:16:18 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 c0242ea4bde1 -r 7466029bf3cd make/solaris/makefiles/vm.make
--- a/make/solaris/makefiles/vm.make	Mon Oct 12 12:34:13 2015 -0700
+++ b/make/solaris/makefiles/vm.make	Wed Oct 14 12:16:18 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