Wed, 07 Oct 2015 08:34:54 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Tue Oct 06 11:01:56 2015 -0700 1.2 +++ b/.hgtags Wed Oct 07 08:34:54 2015 -0700 1.3 @@ -739,6 +739,7 @@ 1.4 ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14 1.5 03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15 1.6 b4137dc9b1a83409fbd2b80d2ffd5ae949cd7a6b jdk8u65-b16 1.7 +8e9c73f18f7e565f1d2100fab7cb8e9e785b1991 jdk8u65-b17 1.8 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00 1.9 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01 1.10 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02 1.11 @@ -754,5 +755,6 @@ 1.12 9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14 1.13 5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15 1.14 4bbf0e9196f2786e0bc4f17664e2533808d944bf jdk8u66-b16 1.15 +a6f2a7ba281291f5dab79fa494f7cfaa6232c88b jdk8u66-b17 1.16 b8f426369187c32551f0a3d571d933908988c81c jdk8u72-b00 1.17 c0205eddb31766ece562483595ec28a7506971e9 jdk8u72-b01
2.1 --- a/make/solaris/makefiles/buildtree.make Tue Oct 06 11:01:56 2015 -0700 2.2 +++ b/make/solaris/makefiles/buildtree.make Wed Oct 07 08:34:54 2015 -0700 2.3 @@ -265,9 +265,12 @@ 2.4 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \ 2.5 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ 2.6 echo; \ 2.7 + [ -n "$(INCLUDE_TRACE)" ] && \ 2.8 + echo && echo "INCLUDE_TRACE = $(INCLUDE_TRACE)"; \ 2.9 [ -n "$(SPEC)" ] && \ 2.10 echo "include $(SPEC)"; \ 2.11 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ 2.12 + echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \ 2.13 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ 2.14 ) > $@ 2.15
3.1 --- a/make/solaris/makefiles/vm.make Tue Oct 06 11:01:56 2015 -0700 3.2 +++ b/make/solaris/makefiles/vm.make Wed Oct 07 08:34:54 2015 -0700 3.3 @@ -204,7 +204,7 @@ 3.4 ZERO_SPECIFIC_FILES := zero 3.5 3.6 # Always exclude these. 3.7 -Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 3.8 +Src_Files_EXCLUDE += dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 3.9 3.10 # Exclude per type. 3.11 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp