Thu, 04 Sep 2014 09:37:41 -0700
8054970: gc src file exclusion should exclude alternative sources
Reviewed-by: ehelin, stefank
make/excludeSrc.make | file | annotate | diff | comparison | revisions |
1.1 --- a/make/excludeSrc.make Fri Aug 22 06:28:14 2014 -0700 1.2 +++ b/make/excludeSrc.make Thu Sep 04 09:37:41 2014 -0700 1.3 @@ -21,6 +21,9 @@ 1.4 # questions. 1.5 # 1.6 # 1.7 + 1.8 +include $(GAMMADIR)/make/altsrc.make 1.9 + 1.10 ifeq ($(INCLUDE_JVMTI), false) 1.11 CXXFLAGS += -DINCLUDE_JVMTI=0 1.12 CFLAGS += -DINCLUDE_JVMTI=0 1.13 @@ -78,12 +81,12 @@ 1.14 CXXFLAGS += -DINCLUDE_ALL_GCS=0 1.15 CFLAGS += -DINCLUDE_ALL_GCS=0 1.16 1.17 - gc_impl := $(GAMMADIR)/src/share/vm/gc_implementation 1.18 - gc_exclude := \ 1.19 - $(notdir $(wildcard $(gc_impl)/concurrentMarkSweep/*.cpp)) \ 1.20 - $(notdir $(wildcard $(gc_impl)/g1/*.cpp)) \ 1.21 - $(notdir $(wildcard $(gc_impl)/parallelScavenge/*.cpp)) \ 1.22 - $(notdir $(wildcard $(gc_impl)/parNew/*.cpp)) 1.23 + gc_impl := $(HS_COMMON_SRC)/share/vm/gc_implementation 1.24 + gc_impl_alt := $(HS_ALT_SRC)/share/vm/gc_implementation 1.25 + gc_subdirs := concurrentMarkSweep g1 parallelScavenge parNew 1.26 + gc_exclude := $(foreach gc,$(gc_subdirs), \ 1.27 + $(notdir $(wildcard $(gc_impl)/$(gc)/*.cpp)) \ 1.28 + $(notdir $(wildcard $(gc_impl_alt)/$(gc)/*.cpp))) 1.29 Src_Files_EXCLUDE += $(gc_exclude) 1.30 1.31 # Exclude everything in $(gc_impl)/shared except the files listed