Mercurial > hg > graal-compiler

comparison make/Makefile @ 18041:52b4284cb496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents b03a16cc5245
children 7d8270532cd9
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
88 SHARED_DIR=$(OUTPUTDIR)/shared 88 SHARED_DIR=$(OUTPUTDIR)/shared
89 89
90 # Typical C1/C2 targets made available with this Makefile 90 # Typical C1/C2 targets made available with this Makefile
91 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1 91 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1
92 C2_VM_TARGETS=product fastdebug optimized debug 92 C2_VM_TARGETS=product fastdebug optimized debug
93 CORE_VM_TARGETS=productcore fastdebugcore optimizedcore debugcore
93 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero 94 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
94 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark 95 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
95 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1 96 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
96 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal 97 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal
97 98
138 all_productshark: productshark docs export_product 139 all_productshark: productshark docs export_product
139 all_fastdebugshark: fastdebugshark docs export_fastdebug 140 all_fastdebugshark: fastdebugshark docs export_fastdebug
140 all_debugshark: debugshark docs export_debug 141 all_debugshark: debugshark docs export_debug
141 all_optimizedshark: optimizedshark docs export_optimized 142 all_optimizedshark: optimizedshark docs export_optimized
142 143
144 allcore: all_productcore all_fastdebugcore
145 all_productcore: productcore docs export_product
146 all_fastdebugcore: fastdebugcore docs export_fastdebug
147 all_debugcore: debugcore docs export_debug
148 all_optimizedcore: optimizedcore docs export_optimized
149
143 allgraal: all_productgraal all_fastdebuggraal 150 allgraal: all_productgraal all_fastdebuggraal
144 all_productgraal: productgraal docs export_product 151 all_productgraal: productgraal docs export_product
145 all_fastdebuggraal: fastdebuggraal docs export_fastdebug 152 all_fastdebuggraal: fastdebuggraal docs export_fastdebug
146 all_debuggraal: debuggraal docs export_debug 153 all_debuggraal: debuggraal docs export_debug
147 all_optimizedgraal: optimizedgraal docs export_optimized 154 all_optimizedgraal: optimizedgraal docs export_optimized
162 endif 169 endif
163 170
164 # Output directories 171 # Output directories
165 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 172 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
166 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 173 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
174 CORE_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_core
167 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal 175 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal
168 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1 176 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
169 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero 177 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero
170 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark 178 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark
171 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal 179 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal
176 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT) 184 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
177 185
178 $(C2_VM_TARGETS): 186 $(C2_VM_TARGETS):
179 $(CD) $(GAMMADIR)/make; \ 187 $(CD) $(GAMMADIR)/make; \
180 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) 188 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
189
190 $(CORE_VM_TARGETS):
191 $(CD) $(GAMMADIR)/make; \
192 $(MAKE) BUILD_DIR=$(CORE_DIR) BUILD_FLAVOR=$(@:%core=%) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
181 193
182 $(ZERO_VM_TARGETS): 194 $(ZERO_VM_TARGETS):
183 $(CD) $(GAMMADIR)/make; \ 195 $(CD) $(GAMMADIR)/make; \
184 $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT) 196 $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
185 197
238 $(CD) $(OUTPUTDIR); \ 250 $(CD) $(OUTPUTDIR); \
239 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 251 $(MAKE) -f $(ABS_OS_MAKEFILE) \
240 $(MAKE_ARGS) $(VM_TARGET) 252 $(MAKE_ARGS) $(VM_TARGET)
241 endif 253 endif
242 254
255 generic_buildcore: $(HOTSPOT_SCRIPT)
256 ifeq ($(HS_ARCH),ppc)
257 ifeq ($(ARCH_DATA_MODEL),64)
258 $(MKDIR) -p $(OUTPUTDIR)
259 $(CD) $(OUTPUTDIR); \
260 $(MAKE) -f $(ABS_OS_MAKEFILE) \
261 $(MAKE_ARGS) $(VM_TARGET)
262 else
263 @$(ECHO) "No ($(VM_TARGET)) for ppc ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
264 endif
265 else
266 @$(ECHO) "No ($(VM_TARGET)) for $(HS_ARCH)"
267 endif
268
243 generic_buildzero: $(HOTSPOT_SCRIPT) 269 generic_buildzero: $(HOTSPOT_SCRIPT)
244 $(MKDIR) -p $(OUTPUTDIR) 270 $(MKDIR) -p $(OUTPUTDIR)
245 $(CD) $(OUTPUTDIR); \ 271 $(CD) $(OUTPUTDIR); \
246 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 272 $(MAKE) -f $(ABS_OS_MAKEFILE) \
247 $(MAKE_ARGS) $(VM_TARGET) 273 $(MAKE_ARGS) $(VM_TARGET)
308 # Export file copy rules 334 # Export file copy rules
309 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 335 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
310 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs 336 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
311 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR) 337 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR)
312 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR) 338 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR)
339 CORE_BUILD_DIR =$(CORE_DIR)/$(BUILD_FLAVOR)
313 GRAAL_BUILD_DIR =$(GRAAL_DIR)/$(BUILD_FLAVOR) 340 GRAAL_BUILD_DIR =$(GRAAL_DIR)/$(BUILD_FLAVOR)
314 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR) 341 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR)
315 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR) 342 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR)
316 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR) 343 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR)
317 344
318 # Server (C2) and Graal 345 # Server (C2)
319 ifeq ($(JVM_VARIANT_SERVER), true) 346 ifeq ($(JVM_VARIANT_SERVER), true)
320 # Common 347 # Common
321 $(EXPORT_SERVER_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz 348 $(EXPORT_SERVER_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
322 $(install-file) 349 $(install-file)
323 $(EXPORT_LIB_DIR)/%.jar: $(C2_BUILD_DIR)/../generated/%.jar 350 $(EXPORT_LIB_DIR)/%.jar: $(C2_BUILD_DIR)/../generated/%.jar
533 # MacOS X 560 # MacOS X
534 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM 561 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM
535 $(install-dir) 562 $(install-dir)
536 $(EXPORT_SERVER_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM 563 $(EXPORT_SERVER_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM
537 $(install-dir) 564 $(install-dir)
565 endif
566
567 # Core
568 ifeq ($(JVM_VARIANT_CORE), true)
569 # Common
570 $(EXPORT_LIB_DIR)/%.jar: $(CORE_BUILD_DIR)/../generated/%.jar
571 $(install-file)
572 $(EXPORT_INCLUDE_DIR)/%: $(CORE_BUILD_DIR)/../generated/jvmtifiles/%
573 $(install-file)
574 # Unix
575 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
576 $(install-file)
577 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_BUILD_DIR)/%.debuginfo
578 $(install-file)
579 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_BUILD_DIR)/%.diz
580 $(install-file)
581 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
582 $(install-file)
583 $(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_BUILD_DIR)/%.debuginfo
584 $(install-file)
585 $(EXPORT_SERVER_DIR)/%.diz: $(CORE_BUILD_DIR)/%.diz
586 $(install-file)
538 endif 587 endif
539 588
540 # Shark 589 # Shark
541 ifeq ($(JVM_VARIANT_ZEROSHARK), true) 590 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
542 # Common 591 # Common
609 clobber clean: clean_build clean_export clean_jdk 658 clobber clean: clean_build clean_export clean_jdk
610 clean_build: 659 clean_build:
611 $(RM) -r $(SHARED_DIR) 660 $(RM) -r $(SHARED_DIR)
612 $(RM) -r $(C1_DIR) 661 $(RM) -r $(C1_DIR)
613 $(RM) -r $(C2_DIR) 662 $(RM) -r $(C2_DIR)
663 $(RM) -r $(CORE_DIR)
614 $(RM) -r $(GRAAL_DIR) 664 $(RM) -r $(GRAAL_DIR)
615 $(RM) -r $(ZERO_DIR) 665 $(RM) -r $(ZERO_DIR)
616 $(RM) -r $(SHARK_DIR) 666 $(RM) -r $(SHARK_DIR)
617 $(RM) -r $(MINIMAL1_DIR) 667 $(RM) -r $(MINIMAL1_DIR)
618 clean_export: 668 clean_export: