Mercurial > hg > truffle

comparison make/bsd/makefiles/vm.make @ 18929:8f2fb6bec986

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed GPU code
author Doug Simon <doug.simon@oracle.com>
date Fri, 23 Jan 2015 10:54:21 +0100
parents 2a69cbe850a8
children 7848fc12602b
comparison
equal deleted inserted replaced
18928:c8fc6e2d128b 18929:8f2fb6bec986
178 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) 178 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
179 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 179 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
180 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm 180 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
181 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm 181 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
182 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm 182 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
183 SOURCE_PATHS+=$(HS_COMMON_SRC)/gpu/ptx/vm
184 SOURCE_PATHS+=$(HS_COMMON_SRC)/gpu/hsail/vm
185 183
186 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) 184 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
187 CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles 185 CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
188 186
189 ifneq ($(INCLUDE_TRACE), false) 187 ifneq ($(INCLUDE_TRACE), false)
202 COMPILER2_PATHS += $(GENERATED)/adfiles 200 COMPILER2_PATHS += $(GENERATED)/adfiles
203 201
204 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark 202 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
205 203
206 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) 204 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
207 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/gpu/ptx/vm)
208 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal 205 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
209 GRAAL_PATHS += $(HS_COMMON_SRC)/gpu/ptx/vm
210 206
211 # Include dirs per type. 207 # Include dirs per type.
212 Src_Dirs/CORE := $(CORE_PATHS) 208 Src_Dirs/CORE := $(CORE_PATHS)
213 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) 209 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS)
214 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) 210 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS)
223 SHARK_SPECIFIC_FILES := shark 219 SHARK_SPECIFIC_FILES := shark
224 ZERO_SPECIFIC_FILES := zero 220 ZERO_SPECIFIC_FILES := zero
225 221
226 ifneq ($(INCLUDE_GRAAL), true) 222 ifneq ($(INCLUDE_GRAAL), true)
227 GRAAL_SPECIFIC_FILES := graal\* 223 GRAAL_SPECIFIC_FILES := graal\*
228 GRAAL_SPECIFIC_GPU_FILES := gpu\* ptx\* hsail\*
229 else 224 else
230 GRAAL_SPECIFIC_FILES := 225 GRAAL_SPECIFIC_FILES :=
231 GRAAL_SPECIFIC_GPU_FILES :=
232 Src_Dirs_I += $(HS_COMMON_SRC)/../graal/com.oracle.graal.hotspot/src_gen/hotspot 226 Src_Dirs_I += $(HS_COMMON_SRC)/../graal/com.oracle.graal.hotspot/src_gen/hotspot
233 endif 227 endif
234 228
235 # Always exclude these. 229 # Always exclude these.
236 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 230 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
237 231
238 # Exclude per type. 232 # Exclude per type.
239 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) ciTypeFlow.cpp 233 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
240 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) ciTypeFlow.cpp 234 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
241 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) 235 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
242 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) 236 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
243 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) ciTypeFlow.cpp 237 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
244 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) 238 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
245 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 239 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
246 240
247 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) 241 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
248 242
249 # Special handling of arch model. 243 # Special handling of arch model.