提交 e77f60a0 编写于 作者: A asaha

Merge

...@@ -739,6 +739,7 @@ a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12 ...@@ -739,6 +739,7 @@ a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12
ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14 ccc03258fbcfbcdf515ceb87bd3699c8f849dc0d jdk8u65-b14
03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15 03ca585abe68e4dcce5bc162a0fa0593eb8fa2ee jdk8u65-b15
b4137dc9b1a83409fbd2b80d2ffd5ae949cd7a6b jdk8u65-b16 b4137dc9b1a83409fbd2b80d2ffd5ae949cd7a6b jdk8u65-b16
8e9c73f18f7e565f1d2100fab7cb8e9e785b1991 jdk8u65-b17
878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00
777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01
0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
......
...@@ -265,9 +265,12 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst ...@@ -265,9 +265,12 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \ echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
echo; \ echo; \
[ -n "$(INCLUDE_TRACE)" ] && \
echo && echo "INCLUDE_TRACE = $(INCLUDE_TRACE)"; \
[ -n "$(SPEC)" ] && \ [ -n "$(SPEC)" ] && \
echo "include $(SPEC)"; \ echo "include $(SPEC)"; \
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
) > $@ ) > $@
......
...@@ -204,7 +204,7 @@ SHARK_SPECIFIC_FILES := shark ...@@ -204,7 +204,7 @@ SHARK_SPECIFIC_FILES := shark
ZERO_SPECIFIC_FILES := zero ZERO_SPECIFIC_FILES := zero
# Always exclude these. # 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. # Exclude per type.
Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册