Mercurial > hg > graal-jvmci-8

comparison make/solaris/makefiles/vm.make @ 6557:297543799769

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed makefile to build on Solaris.
author Laurent Daynes <Laurent.Daynes@oracle.com>
date Fri, 19 Oct 2012 09:55:54 +0200
parents fb8f9ab27c14
children 30fa86b78648
comparison
equal deleted inserted replaced
6555:e90943411083 6557:297543799769
162 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo 162 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
163 LIBJVM_DIZ = lib$(JVM).diz 163 LIBJVM_DIZ = lib$(JVM).diz
164 LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo 164 LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
165 LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz 165 LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz
166 166
167 SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt 167 SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt graal
168 168
169 SOURCE_PATHS=\ 169 SOURCE_PATHS=\
170 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ 170 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
171 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) 171 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
172 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 172 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
188 COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt) 188 COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)
189 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto 189 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
190 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt 190 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
191 COMPILER2_PATHS += $(GENERATED)/adfiles 191 COMPILER2_PATHS += $(GENERATED)/adfiles
192 192
193 GRAAL_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
194 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/c1
195 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
196 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
197
193 # Include dirs per type. 198 # Include dirs per type.
194 Src_Dirs/CORE := $(CORE_PATHS) 199 Src_Dirs/CORE := $(CORE_PATHS)
195 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) 200 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
196 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) 201 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
197 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) 202 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
198 Src_Dirs/ZERO := $(CORE_PATHS) 203 Src_Dirs/ZERO := $(CORE_PATHS)
199 Src_Dirs/SHARK := $(CORE_PATHS) 204 Src_Dirs/SHARK := $(CORE_PATHS)
205 Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS)
200 Src_Dirs := $(Src_Dirs/$(TYPE)) 206 Src_Dirs := $(Src_Dirs/$(TYPE))
201 207
202 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* 208 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
203 COMPILER1_SPECIFIC_FILES := c1_\* 209 COMPILER1_SPECIFIC_FILES := c1_\*
204 SHARK_SPECIFIC_FILES := shark 210 SHARK_SPECIFIC_FILES := shark
205 ZERO_SPECIFIC_FILES := zero 211 ZERO_SPECIFIC_FILES := zero
212 GRAAL_SPECIFIC_FILES := graal
206 213
207 # Always exclude these. 214 # Always exclude these.
208 Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 215 Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
209 216
210 # Exclude per type. 217 # Exclude per type.
212 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 219 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
213 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 220 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
214 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 221 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
215 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 222 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
216 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) 223 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES)
224 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
217 225
218 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) 226 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
219 227
220 # Special handling of arch model. 228 # Special handling of arch model.
221 ifeq ($(Platform_arch_model), x86_32) 229 ifeq ($(Platform_arch_model), x86_32)