Mercurial > hg > truffle
comparison make/linux/makefiles/vm.make @ 21559:be896a1983c0
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 |
---|---|
111 # Large File Support | 111 # Large File Support |
112 ifneq ($(LP64), 1) | 112 ifneq ($(LP64), 1) |
113 CXXFLAGS/ostream.o += -D_FILE_OFFSET_BITS=64 | 113 CXXFLAGS/ostream.o += -D_FILE_OFFSET_BITS=64 |
114 endif # ifneq ($(LP64), 1) | 114 endif # ifneq ($(LP64), 1) |
115 | 115 |
116 ifeq ($(INCLUDE_GRAAL), true) | |
117 CXXFLAGS += -DGRAAL_VERSION="\"$(GRAAL_VERSION)\"" | |
118 endif | |
119 | |
120 # CFLAGS_WARN holds compiler options to suppress/enable warnings. | 116 # CFLAGS_WARN holds compiler options to suppress/enable warnings. |
121 CFLAGS += $(CFLAGS_WARN/BYFILE) | 117 CFLAGS += $(CFLAGS_WARN/BYFILE) |
122 | 118 |
123 # Do not use C++ exception handling | 119 # Do not use C++ exception handling |
124 CFLAGS += $(CFLAGS/NOEX) | 120 CFLAGS += $(CFLAGS/NOEX) |
149 LIBJVM = lib$(JVM).so | 145 LIBJVM = lib$(JVM).so |
150 | 146 |
151 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo | 147 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo |
152 LIBJVM_DIZ = lib$(JVM).diz | 148 LIBJVM_DIZ = lib$(JVM).diz |
153 | 149 |
154 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt graal | 150 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt jvmci |
155 | 151 |
156 SOURCE_PATHS=\ | 152 SOURCE_PATHS=\ |
157 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ | 153 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ |
158 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) | 154 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) |
159 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm | 155 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm |
179 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt | 175 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt |
180 COMPILER2_PATHS += $(GENERATED)/adfiles | 176 COMPILER2_PATHS += $(GENERATED)/adfiles |
181 | 177 |
182 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark | 178 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark |
183 | 179 |
184 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) | 180 JVMCI_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/jvmci) |
185 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal | 181 JVMCI_PATHS += $(HS_COMMON_SRC)/share/vm/jvmci |
186 | 182 |
187 # Include dirs per type. | 183 # Include dirs per type. |
188 Src_Dirs/CORE := $(CORE_PATHS) | 184 Src_Dirs/CORE := $(CORE_PATHS) |
189 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) | 185 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(JVMCI_PATHS) |
190 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) | 186 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(JVMCI_PATHS) |
191 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) | 187 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) $(JVMCI_PATHS) |
192 Src_Dirs/ZERO := $(CORE_PATHS) | 188 Src_Dirs/ZERO := $(CORE_PATHS) |
193 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) | 189 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) |
194 Src_Dirs/GRAAL := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) | 190 Src_Dirs/JVMCI := $(CORE_PATHS) $(COMPILER1_PATHS) $(JVMCI_PATHS) |
195 Src_Dirs := $(Src_Dirs/$(TYPE)) | 191 Src_Dirs := $(Src_Dirs/$(TYPE)) |
196 | 192 |
197 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\* | 193 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\* |
198 COMPILER1_SPECIFIC_FILES := c1_\* | 194 COMPILER1_SPECIFIC_FILES := c1_\* |
199 SHARK_SPECIFIC_FILES := shark | 195 SHARK_SPECIFIC_FILES := shark |
200 ZERO_SPECIFIC_FILES := zero | 196 ZERO_SPECIFIC_FILES := zero |
201 | 197 |
202 ifneq ($(INCLUDE_GRAAL), true) | 198 ifneq ($(INCLUDE_JVMCI), true) |
203 GRAAL_SPECIFIC_FILES := graal\* | 199 JVMCI_SPECIFIC_FILES := jvmci\* |
204 else | 200 else |
205 GRAAL_SPECIFIC_FILES := | 201 JVMCI_SPECIFIC_FILES := |
206 Src_Dirs_I += $(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot | 202 Src_Dirs_I += $(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot |
207 endif | 203 endif |
208 | 204 |
209 # Always exclude these. | 205 # Always exclude these. |
210 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp | 206 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp |
211 | 207 |
212 # Exclude per type. | 208 # Exclude per type. |
213 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp | 209 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES) ciTypeFlow.cpp |
214 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp | 210 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES) ciTypeFlow.cpp |
215 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) | 211 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES) |
216 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) | 212 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES) |
217 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) ciTypeFlow.cpp | 213 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES) ciTypeFlow.cpp |
218 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(GRAAL_SPECIFIC_FILES) | 214 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(JVMCI_SPECIFIC_FILES) |
219 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp | 215 Src_Files_EXCLUDE/JVMCI := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp |
220 | 216 |
221 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) | 217 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) |
222 | 218 |
223 # Special handling of arch model. | 219 # Special handling of arch model. |
224 ifeq ($(Platform_arch_model), x86_32) | 220 ifeq ($(Platform_arch_model), x86_32) |