Mercurial > hg > truffle

comparison make/bsd/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 989155e2d07a
comparison
equal deleted inserted replaced
7153:c421c19b7bf8 7154:5d0bb7d52783
178 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) 178 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
179 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal 179 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
180 180
181 # Include dirs per type. 181 # Include dirs per type.
182 Src_Dirs/CORE := $(CORE_PATHS) 182 Src_Dirs/CORE := $(CORE_PATHS)
183 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) 183 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS)
184 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) 184 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS)
185 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) 185 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS)
186 Src_Dirs/ZERO := $(CORE_PATHS) 186 Src_Dirs/ZERO := $(CORE_PATHS)
187 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) 187 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
188 Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS) 188 Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS)
189 Src_Dirs := $(Src_Dirs/$(TYPE)) 189 Src_Dirs := $(Src_Dirs/$(TYPE))
190 190
191 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* 191 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
192 COMPILER1_SPECIFIC_FILES := c1_\* 192 COMPILER1_SPECIFIC_FILES := c1_\*
193 SHARK_SPECIFIC_FILES := shark 193 SHARK_SPECIFIC_FILES := shark
194 ZERO_SPECIFIC_FILES := zero 194 ZERO_SPECIFIC_FILES := zero
195 GRAAL_SPECIFIC_FILES := graal\* 195
196 ifdef OMIT_GRAAL
197 GRAAL_SPECIFIC_FILES := graal\*
198 else
199 GRAAL_SPECIFIC_FILES :=
200 endif
196 201
197 # Always exclude these. 202 # Always exclude these.
198 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 203 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
199 204
200 # Exclude per type. 205 # Exclude per type.