Mercurial > hg > graal-jvmci-8

comparison make/excludeSrc.make @ 20402:1202792c966e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8054970: gc src file exclusion should exclude alternative sources Reviewed-by: ehelin, stefank
author jcoomes
date Thu, 04 Sep 2014 09:37:41 -0700
parents 6e0cb14ce59b
children 9609f24cecee
comparison
equal deleted inserted replaced
20401:3f9ff5e261c6 20402:1202792c966e
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24
25 include $(GAMMADIR)/make/altsrc.make
26
24 ifeq ($(INCLUDE_JVMTI), false) 27 ifeq ($(INCLUDE_JVMTI), false)
25 CXXFLAGS += -DINCLUDE_JVMTI=0 28 CXXFLAGS += -DINCLUDE_JVMTI=0
26 CFLAGS += -DINCLUDE_JVMTI=0 29 CFLAGS += -DINCLUDE_JVMTI=0
27 30
28 Src_Files_EXCLUDE += jvmtiGetLoadedClasses.cpp jvmtiThreadState.cpp jvmtiExtensions.cpp \ 31 Src_Files_EXCLUDE += jvmtiGetLoadedClasses.cpp jvmtiThreadState.cpp jvmtiExtensions.cpp \
76 79
77 ifeq ($(INCLUDE_ALL_GCS), false) 80 ifeq ($(INCLUDE_ALL_GCS), false)
78 CXXFLAGS += -DINCLUDE_ALL_GCS=0 81 CXXFLAGS += -DINCLUDE_ALL_GCS=0
79 CFLAGS += -DINCLUDE_ALL_GCS=0 82 CFLAGS += -DINCLUDE_ALL_GCS=0
80 83
81 gc_impl := $(GAMMADIR)/src/share/vm/gc_implementation 84 gc_impl := $(HS_COMMON_SRC)/share/vm/gc_implementation
82 gc_exclude := \ 85 gc_impl_alt := $(HS_ALT_SRC)/share/vm/gc_implementation
83 $(notdir $(wildcard $(gc_impl)/concurrentMarkSweep/*.cpp)) \ 86 gc_subdirs := concurrentMarkSweep g1 parallelScavenge parNew
84 $(notdir $(wildcard $(gc_impl)/g1/*.cpp)) \ 87 gc_exclude := $(foreach gc,$(gc_subdirs), \
85 $(notdir $(wildcard $(gc_impl)/parallelScavenge/*.cpp)) \ 88 $(notdir $(wildcard $(gc_impl)/$(gc)/*.cpp)) \
86 $(notdir $(wildcard $(gc_impl)/parNew/*.cpp)) 89 $(notdir $(wildcard $(gc_impl_alt)/$(gc)/*.cpp)))
87 Src_Files_EXCLUDE += $(gc_exclude) 90 Src_Files_EXCLUDE += $(gc_exclude)
88 91
89 # Exclude everything in $(gc_impl)/shared except the files listed 92 # Exclude everything in $(gc_impl)/shared except the files listed
90 # in $(gc_shared_keep). 93 # in $(gc_shared_keep).
91 gc_shared_all := $(notdir $(wildcard $(gc_impl)/shared/*.cpp)) 94 gc_shared_all := $(notdir $(wildcard $(gc_impl)/shared/*.cpp))