Mercurial > hg > truffle

comparison make/linux/makefiles/vm.make @ 7154:5d0bb7d52783

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
author Doug Simon <doug.simon@oracle.com>
date Wed, 12 Dec 2012 21:36:40 +0100
parents 1baf7f1e3f23
children 762717d2cf90
comparison
equal deleted inserted replaced
7153:c421c19b7bf8 7154:5d0bb7d52783
180 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) 180 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
181 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal 181 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
182 182
183 # Include dirs per type. 183 # Include dirs per type.
184 Src_Dirs/CORE := $(CORE_PATHS) 184 Src_Dirs/CORE := $(CORE_PATHS)
185 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) 185 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS)
186 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) 186 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS)
187 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) 187 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS)
188 Src_Dirs/ZERO := $(CORE_PATHS) 188 Src_Dirs/ZERO := $(CORE_PATHS)
189 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) 189 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
190 Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS) 190 Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS)
191 Src_Dirs := $(Src_Dirs/$(TYPE)) 191 Src_Dirs := $(Src_Dirs/$(TYPE))
192 192
193 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* 193 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
194 COMPILER1_SPECIFIC_FILES := c1_\* 194 COMPILER1_SPECIFIC_FILES := c1_\*
195 SHARK_SPECIFIC_FILES := shark 195 SHARK_SPECIFIC_FILES := shark
196 ZERO_SPECIFIC_FILES := zero 196 ZERO_SPECIFIC_FILES := zero
197 GRAAL_SPECIFIC_FILES := graal\* 197
198 ifdef OMIT_GRAAL
199 GRAAL_SPECIFIC_FILES := graal\*
200 else
201 GRAAL_SPECIFIC_FILES :=
202 endif
198 203
199 # Always exclude these. 204 # Always exclude these.
200 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 205 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
201 206
202 # Exclude per type. 207 # Exclude per type.