Mercurial > hg > graal-jvmci-8

comparison make/bsd/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 5d0bb7d52783
comparison
equal deleted inserted replaced
7124:ab65fa23f8e9 7125:1baf7f1e3f23
173 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt 173 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
174 COMPILER2_PATHS += $(GENERATED)/adfiles 174 COMPILER2_PATHS += $(GENERATED)/adfiles
175 175
176 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark 176 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
177 177
178 GRAAL_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
179 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/c1
180 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) 178 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
181 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal 179 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
182 180
183 # Include dirs per type. 181 # Include dirs per type.
184 Src_Dirs/CORE := $(CORE_PATHS) 182 Src_Dirs/CORE := $(CORE_PATHS)
192 190
193 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* 191 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
194 COMPILER1_SPECIFIC_FILES := c1_\* 192 COMPILER1_SPECIFIC_FILES := c1_\*
195 SHARK_SPECIFIC_FILES := shark 193 SHARK_SPECIFIC_FILES := shark
196 ZERO_SPECIFIC_FILES := zero 194 ZERO_SPECIFIC_FILES := zero
197 GRAAL_SPECIFIC_FILES := graal 195 GRAAL_SPECIFIC_FILES := graal\*
198 196
199 # Always exclude these. 197 # Always exclude these.
200 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 198 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
201 199
202 # Exclude per type. 200 # Exclude per type.
203 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 201 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
204 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 202 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
205 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 203 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
206 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 204 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
207 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 205 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
208 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) 206 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
209 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 207 Src_Files_EXCLUDE/GRAAL := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
210 208
211 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) 209 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
212 210
213 # Special handling of arch model. 211 # Special handling of arch model.
214 ifeq ($(Platform_arch_model), x86_32) 212 ifeq ($(Platform_arch_model), x86_32)