comparison make/excludeSrc.make @ 20409:c9635cad4a5d hs25.40-b09

Merge
author amurillo
date Fri, 05 Sep 2014 15:02:43 -0700
parents 1202792c966e
children 9609f24cecee
comparison
equal deleted inserted replaced
20372:efbd07229e6c 20409:c9635cad4a5d
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 \
68 71
69 ifeq ($(INCLUDE_CDS), false) 72 ifeq ($(INCLUDE_CDS), false)
70 CXXFLAGS += -DINCLUDE_CDS=0 73 CXXFLAGS += -DINCLUDE_CDS=0
71 CFLAGS += -DINCLUDE_CDS=0 74 CFLAGS += -DINCLUDE_CDS=0
72 75
73 Src_Files_EXCLUDE += filemap.cpp metaspaceShared.cpp 76 Src_Files_EXCLUDE += filemap.cpp metaspaceShared*.cpp sharedPathsMiscInfo.cpp \
77 systemDictionaryShared.cpp classLoaderExt.cpp sharedClassUtil.cpp
74 endif 78 endif
75 79
76 ifeq ($(INCLUDE_ALL_GCS), false) 80 ifeq ($(INCLUDE_ALL_GCS), false)
77 CXXFLAGS += -DINCLUDE_ALL_GCS=0 81 CXXFLAGS += -DINCLUDE_ALL_GCS=0
78 CFLAGS += -DINCLUDE_ALL_GCS=0 82 CFLAGS += -DINCLUDE_ALL_GCS=0
79 83
80 gc_impl := $(GAMMADIR)/src/share/vm/gc_implementation 84 gc_impl := $(HS_COMMON_SRC)/share/vm/gc_implementation
81 gc_exclude := \ 85 gc_impl_alt := $(HS_ALT_SRC)/share/vm/gc_implementation
82 $(notdir $(wildcard $(gc_impl)/concurrentMarkSweep/*.cpp)) \ 86 gc_subdirs := concurrentMarkSweep g1 parallelScavenge parNew
83 $(notdir $(wildcard $(gc_impl)/g1/*.cpp)) \ 87 gc_exclude := $(foreach gc,$(gc_subdirs), \
84 $(notdir $(wildcard $(gc_impl)/parallelScavenge/*.cpp)) \ 88 $(notdir $(wildcard $(gc_impl)/$(gc)/*.cpp)) \
85 $(notdir $(wildcard $(gc_impl)/parNew/*.cpp)) 89 $(notdir $(wildcard $(gc_impl_alt)/$(gc)/*.cpp)))
86 Src_Files_EXCLUDE += $(gc_exclude) 90 Src_Files_EXCLUDE += $(gc_exclude)
87 91
88 # Exclude everything in $(gc_impl)/shared except the files listed 92 # Exclude everything in $(gc_impl)/shared except the files listed
89 # in $(gc_shared_keep). 93 # in $(gc_shared_keep).
90 gc_shared_all := $(notdir $(wildcard $(gc_impl)/shared/*.cpp)) 94 gc_shared_all := $(notdir $(wildcard $(gc_impl)/shared/*.cpp))