comparison make/linux/makefiles/vm.make @ 3547:44da449fc29c

Update linux makefiles to create a graal VM, make a few run* +x
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Wed, 17 Aug 2011 11:58:19 +0200
parents be4ca325525a
children 04b9a2566eec
comparison
equal deleted inserted replaced
3546:4aa80ca3dbec 3547:44da449fc29c
146 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt 146 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
147 COMPILER2_PATHS += $(GENERATED)/adfiles 147 COMPILER2_PATHS += $(GENERATED)/adfiles
148 148
149 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark 149 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
150 150
151 GRAAL_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
152 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/c1
153 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
154 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
155
151 # Include dirs per type. 156 # Include dirs per type.
152 Src_Dirs/CORE := $(CORE_PATHS) 157 Src_Dirs/CORE := $(CORE_PATHS)
153 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) 158 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
154 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) 159 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
155 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) 160 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
156 Src_Dirs/ZERO := $(CORE_PATHS) 161 Src_Dirs/ZERO := $(CORE_PATHS)
157 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) 162 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
163 Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS)
158 Src_Dirs := $(Src_Dirs/$(TYPE)) 164 Src_Dirs := $(Src_Dirs/$(TYPE))
159 165
160 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* 166 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
161 COMPILER1_SPECIFIC_FILES := c1_\* 167 COMPILER1_SPECIFIC_FILES := c1_\*
162 SHARK_SPECIFIC_FILES := shark 168 SHARK_SPECIFIC_FILES := shark
163 ZERO_SPECIFIC_FILES := zero 169 ZERO_SPECIFIC_FILES := zero
170 GRAAL_SPECIFIC_FILES := graal
164 171
165 # Always exclude these. 172 # Always exclude these.
166 Src_Files_EXCLUDE := jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 173 Src_Files_EXCLUDE := jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
167 174
168 # Exclude per type. 175 # Exclude per type.
170 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 177 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
171 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 178 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
172 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 179 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
173 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 180 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
174 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) 181 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES)
182 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
175 183
176 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) 184 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
177 185
178 # Special handling of arch model. 186 # Special handling of arch model.
179 ifeq ($(Platform_arch_model), x86_32) 187 ifeq ($(Platform_arch_model), x86_32)