Mercurial > hg > graal-jvmci-8
changeset 23525:d2ebaadbcc48
Merge
| author | aefimov |
|---|---|
| date | Tue, 13 Oct 2015 18:10:17 +0300 |
| parents | 0ff90c97d892 (current diff) 9ae2a5adabba (diff) |
| children | 527f62b70fae |
| files | .hgtags |
| diffstat | 3 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Sep 28 15:40:39 2015 -0700 +++ b/.hgtags Tue Oct 13 18:10:17 2015 +0300 @@ -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,3 +760,4 @@ 9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14 5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15 4bbf0e9196f2786e0bc4f17664e2533808d944bf jdk8u66-b16 +a6f2a7ba281291f5dab79fa494f7cfaa6232c88b jdk8u66-b17
--- a/make/solaris/makefiles/buildtree.make Mon Sep 28 15:40:39 2015 -0700 +++ b/make/solaris/makefiles/buildtree.make Tue Oct 13 18:10:17 2015 +0300 @@ -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"; \ ) > $@
--- a/make/solaris/makefiles/vm.make Mon Sep 28 15:40:39 2015 -0700 +++ b/make/solaris/makefiles/vm.make Tue Oct 13 18:10:17 2015 +0300 @@ -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