Mercurial > hg > graal-jvmci-8

comparison make/bsd/makefiles/vm.make @ 21559:be896a1983c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Thu, 28 May 2015 15:36:48 +0200
parents 5324104ac4f3
children 44bad469bec2
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
109 109
110 ifdef DEFAULT_LIBPATH 110 ifdef DEFAULT_LIBPATH
111 CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" 111 CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
112 endif 112 endif
113 113
114 ifeq ($(INCLUDE_GRAAL), true)
115 CXXFLAGS += -DGRAAL_VERSION="\"$(GRAAL_VERSION)\""
116 endif
117
118 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 114 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
119 CFLAGS += $(CFLAGS_WARN/BYFILE) 115 CFLAGS += $(CFLAGS_WARN/BYFILE)
120 116
121 # Do not use C++ exception handling 117 # Do not use C++ exception handling
122 CFLAGS += $(CFLAGS/NOEX) 118 CFLAGS += $(CFLAGS/NOEX)
169 165
170 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo 166 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
171 LIBJVM_DIZ = lib$(JVM).diz 167 LIBJVM_DIZ = lib$(JVM).diz
172 endif 168 endif
173 169
174 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt graal 170 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt jvmci
175 171
176 SOURCE_PATHS=\ 172 SOURCE_PATHS=\
177 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ 173 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
178 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) 174 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
179 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 175 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
199 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt 195 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
200 COMPILER2_PATHS += $(GENERATED)/adfiles 196 COMPILER2_PATHS += $(GENERATED)/adfiles
201 197
202 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark 198 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
203 199
204 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) 200 JVMCI_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/jvmci)
205 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal 201 JVMCI_PATHS += $(HS_COMMON_SRC)/share/vm/jvmci
206 202
207 # Include dirs per type. 203 # Include dirs per type.
208 Src_Dirs/CORE := $(CORE_PATHS) 204 Src_Dirs/CORE := $(CORE_PATHS)
209 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) 205 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(JVMCI_PATHS)
210 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) 206 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(JVMCI_PATHS)
211 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) 207 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) $(JVMCI_PATHS)
212 Src_Dirs/ZERO := $(CORE_PATHS) 208 Src_Dirs/ZERO := $(CORE_PATHS)
213 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) 209 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
214 Src_Dirs/GRAAL := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) 210 Src_Dirs/JVMCI := $(CORE_PATHS) $(COMPILER1_PATHS) $(JVMCI_PATHS)
215 Src_Dirs := $(Src_Dirs/$(TYPE)) 211 Src_Dirs := $(Src_Dirs/$(TYPE))
216 212
217 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\* 213 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\*
218 COMPILER1_SPECIFIC_FILES := c1_\* 214 COMPILER1_SPECIFIC_FILES := c1_\*
219 SHARK_SPECIFIC_FILES := shark 215 SHARK_SPECIFIC_FILES := shark
220 ZERO_SPECIFIC_FILES := zero 216 ZERO_SPECIFIC_FILES := zero
221 217
222 ifneq ($(INCLUDE_GRAAL), true) 218 ifneq ($(INCLUDE_JVMCI), true)
223 GRAAL_SPECIFIC_FILES := graal\* 219 JVMCI_SPECIFIC_FILES := jvmci\*
224 else 220 else
225 GRAAL_SPECIFIC_FILES := 221 JVMCI_SPECIFIC_FILES :=
226 Src_Dirs_I += $(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot 222 Src_Dirs_I += $(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot
227 endif 223 endif
228 224
229 # Always exclude these. 225 # Always exclude these.
230 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 226 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
231 227
232 # Exclude per type. 228 # Exclude per type.
233 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp 229 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES) ciTypeFlow.cpp
234 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp 230 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES) ciTypeFlow.cpp
235 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) 231 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES)
236 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) 232 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES)
237 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp 233 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES) ciTypeFlow.cpp
238 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) 234 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES)
239 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 235 Src_Files_EXCLUDE/JVMCI := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
240 236
241 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) 237 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
242 238
243 # Special handling of arch model. 239 # Special handling of arch model.
244 ifeq ($(Platform_arch_model), x86_32) 240 ifeq ($(Platform_arch_model), x86_32)