Mercurial > hg > graal-compiler

comparison make/linux/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 dffc37fa7157
children 7848fc12602b
comparison
equal deleted inserted replaced
18928:c8fc6e2d128b 18929:8f2fb6bec986
158 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) 158 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
159 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 159 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
160 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm 160 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
161 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm 161 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
162 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm 162 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
163 SOURCE_PATHS+=$(HS_COMMON_SRC)/gpu/ptx/vm
164 SOURCE_PATHS+=$(HS_COMMON_SRC)/gpu/hsail/vm
165 163
166 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) 164 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
167 CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles 165 CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
168 166
169 ifneq ($(INCLUDE_TRACE), false) 167 ifneq ($(INCLUDE_TRACE), false)
182 COMPILER2_PATHS += $(GENERATED)/adfiles 180 COMPILER2_PATHS += $(GENERATED)/adfiles
183 181
184 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark 182 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
185 183
186 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) 184 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
187 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/gpu/ptx/vm)
188 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/gpu/hsail/vm)
189 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal 185 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
190 GRAAL_PATHS += $(HS_COMMON_SRC)/gpu/ptx/vm
191 GRAAL_PATHS += $(HS_COMMON_SRC)/gpu/hsail/vm
192 186
193 # Include dirs per type. 187 # Include dirs per type.
194 Src_Dirs/CORE := $(CORE_PATHS) 188 Src_Dirs/CORE := $(CORE_PATHS)
195 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) 189 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS)
196 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) 190 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS)
205 SHARK_SPECIFIC_FILES := shark 199 SHARK_SPECIFIC_FILES := shark
206 ZERO_SPECIFIC_FILES := zero 200 ZERO_SPECIFIC_FILES := zero
207 201
208 ifneq ($(INCLUDE_GRAAL), true) 202 ifneq ($(INCLUDE_GRAAL), true)
209 GRAAL_SPECIFIC_FILES := graal\* 203 GRAAL_SPECIFIC_FILES := graal\*
210 GRAAL_SPECIFIC_GPU_FILES := gpu\* ptx\* hsail\*
211 else 204 else
212 GRAAL_SPECIFIC_FILES := 205 GRAAL_SPECIFIC_FILES :=
213 GRAAL_SPECIFIC_GPU_FILES :=
214 Src_Dirs_I += $(HS_COMMON_SRC)/../graal/com.oracle.graal.hotspot/src_gen/hotspot 206 Src_Dirs_I += $(HS_COMMON_SRC)/../graal/com.oracle.graal.hotspot/src_gen/hotspot
215 endif 207 endif
216 208
217 # Always exclude these. 209 # Always exclude these.
218 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 210 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
219 211
220 # Exclude per type. 212 # Exclude per type.
221 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 213 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
222 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) ciTypeFlow.cpp 214 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
223 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) 215 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
224 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) 216 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
225 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) ciTypeFlow.cpp 217 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp
226 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) $(GRAAL_SPECIFIC_GPU_FILES) 218 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES)
227 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 219 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
228 220
229 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) 221 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
230 222
231 # Special handling of arch model. 223 # Special handling of arch model.