Mercurial > hg > graal-compiler

comparison make/solaris/makefiles/vm.make @ 7125:1baf7f1e3f23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
decoupled C++ Graal runtime from C1
author Doug Simon <doug.simon@oracle.com>
date Mon, 03 Dec 2012 15:32:17 +0100
parents e522a00b91aa
children 989155e2d07a
comparison
equal deleted inserted replaced
7124:ab65fa23f8e9 7125:1baf7f1e3f23
188 COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt) 188 COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)
189 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto 189 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
190 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt 190 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
191 COMPILER2_PATHS += $(GENERATED)/adfiles 191 COMPILER2_PATHS += $(GENERATED)/adfiles
192 192
193 GRAAL_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
194 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/c1
195 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) 193 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
196 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal 194 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
197 195
198 # Include dirs per type. 196 # Include dirs per type.
199 Src_Dirs/CORE := $(CORE_PATHS) 197 Src_Dirs/CORE := $(CORE_PATHS)
213 211
214 # Always exclude these. 212 # Always exclude these.
215 Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 213 Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
216 214
217 # Exclude per type. 215 # Exclude per type.
218 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 216 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
219 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 217 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
220 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 218 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
221 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 219 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
222 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 220 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
223 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) 221 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
224 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 222 Src_Files_EXCLUDE/GRAAL := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
225 223
226 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) 224 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
227 225
228 # Special handling of arch model. 226 # Special handling of arch model.
229 ifeq ($(Platform_arch_model), x86_32) 227 ifeq ($(Platform_arch_model), x86_32)