Mercurial > hg > truffle

comparison make/Makefile @ 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 3f51d02e536f
children 47bebae7454f
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
82 ALT_OUT=ALT_OUTPUTDIR=$(ALT_OUTPUTDIR) 82 ALT_OUT=ALT_OUTPUTDIR=$(ALT_OUTPUTDIR)
83 else 83 else
84 ALT_OUT= 84 ALT_OUT=
85 endif 85 endif
86 86
87 # Directory for shared code (e.g. graal.jar) 87 # Directory for shared code (e.g. jvmci.jar)
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 CORE_VM_TARGETS=productcore fastdebugcore optimizedcore debugcore
94 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero 94 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
95 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark 95 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
96 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1 96 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
97 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal 97 JVMCI_VM_TARGETS=productjvmci fastdebugjvmci optimizedjvmci debugjvmci
98 98
99 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product 99 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
100 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug 100 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
101 COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug 101 COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug
102 COMMON_VM_OPTIMIZED_TARGETS=optimized optimized1 docs export_optimized 102 COMMON_VM_OPTIMIZED_TARGETS=optimized optimized1 docs export_optimized
147 all_productcore: productcore docs export_product 147 all_productcore: productcore docs export_product
148 all_fastdebugcore: fastdebugcore docs export_fastdebug 148 all_fastdebugcore: fastdebugcore docs export_fastdebug
149 all_debugcore: debugcore docs export_debug 149 all_debugcore: debugcore docs export_debug
150 all_optimizedcore: optimizedcore docs export_optimized 150 all_optimizedcore: optimizedcore docs export_optimized
151 151
152 allgraal: all_productgraal all_fastdebuggraal 152 alljvmci: all_productjvmci all_fastdebugjvmci
153 all_productgraal: productgraal docs export_product 153 all_productjvmci: productjvmci docs export_product
154 all_fastdebuggraal: fastdebuggraal docs export_fastdebug 154 all_fastdebugjvmci: fastdebugjvmci docs export_fastdebug
155 all_debuggraal: debuggraal docs export_debug 155 all_debugjvmci: debugjvmci docs export_debug
156 all_optimizedgraal: optimizedgraal docs export_optimized 156 all_optimizedjvmci: optimizedjvmci docs export_optimized
157 157
158 # Do everything 158 # Do everything
159 world: all create_jdk 159 world: all create_jdk
160 160
161 # Build or export docs 161 # Build or export docs
172 172
173 # Output directories 173 # Output directories
174 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 174 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
175 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 175 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
176 CORE_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_core 176 CORE_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_core
177 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal 177 JVMCI_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_jvmci
178 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1 178 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
179 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero 179 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero
180 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark 180 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark
181 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal 181 JVMCI_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_jvmci
182 182
183 # Build variation of hotspot 183 # Build variation of hotspot
184 $(C1_VM_TARGETS): 184 $(C1_VM_TARGETS):
185 $(CD) $(GAMMADIR)/make; \ 185 $(CD) $(GAMMADIR)/make; \
186 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT) 186 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
203 203
204 $(MINIMAL1_VM_TARGETS): 204 $(MINIMAL1_VM_TARGETS):
205 $(CD) $(GAMMADIR)/make; \ 205 $(CD) $(GAMMADIR)/make; \
206 $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT) 206 $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT)
207 207
208 $(GRAAL_VM_TARGETS): 208 $(JVMCI_VM_TARGETS):
209 $(CD) $(GAMMADIR)/make; \ 209 $(CD) $(GAMMADIR)/make; \
210 $(MAKE) BUILD_DIR=$(GRAAL_DIR) BUILD_FLAVOR=$(@:%graal=%) VM_TARGET=$@ INCLUDE_GRAAL=true generic_buildgraal $(ALT_OUT) 210 $(MAKE) BUILD_DIR=$(JVMCI_DIR) BUILD_FLAVOR=$(@:%jvmci=%) VM_TARGET=$@ INCLUDE_JVMCI=true generic_buildjvmci $(ALT_OUT)
211 211
212 # Install hotspot script in build directory 212 # Install hotspot script in build directory
213 HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot 213 HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot
214 $(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script 214 $(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script
215 $(QUIETLY) $(MKDIR) -p $(BUILD_DIR)/$(BUILD_FLAVOR) 215 $(QUIETLY) $(MKDIR) -p $(BUILD_DIR)/$(BUILD_FLAVOR)
299 endif 299 endif
300 else 300 else
301 @$(ECHO) "Error: trying to build a minimal target but JVM_VARIANT_MINIMAL1 is not true." 301 @$(ECHO) "Error: trying to build a minimal target but JVM_VARIANT_MINIMAL1 is not true."
302 endif 302 endif
303 303
304 generic_buildgraal: $(HOTSPOT_SCRIPT) buildshared 304 generic_buildjvmci: $(HOTSPOT_SCRIPT) buildshared
305 $(MKDIR) -p $(OUTPUTDIR) 305 $(MKDIR) -p $(OUTPUTDIR)
306 $(CD) $(OUTPUTDIR); \ 306 $(CD) $(OUTPUTDIR); \
307 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 307 $(MAKE) -f $(ABS_OS_MAKEFILE) \
308 $(MAKE_ARGS) $(VM_TARGET) 308 $(MAKE_ARGS) $(VM_TARGET)
309 309
348 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 348 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
349 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs 349 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
350 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR) 350 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR)
351 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR) 351 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR)
352 CORE_BUILD_DIR =$(CORE_DIR)/$(BUILD_FLAVOR) 352 CORE_BUILD_DIR =$(CORE_DIR)/$(BUILD_FLAVOR)
353 GRAAL_BUILD_DIR =$(GRAAL_DIR)/$(BUILD_FLAVOR) 353 JVMCI_BUILD_DIR =$(JVMCI_DIR)/$(BUILD_FLAVOR)
354 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR) 354 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR)
355 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR) 355 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR)
356 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR) 356 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR)
357 357
358 # Server (C2) 358 # Server (C2)
402 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM 402 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM
403 $(install-dir) 403 $(install-dir)
404 $(EXPORT_SERVER_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM 404 $(EXPORT_SERVER_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM
405 $(install-dir) 405 $(install-dir)
406 406
407 # Graal 407 # JVMCI
408 # Common 408 # Common
409 $(EXPORT_SERVER_DIR)/%.diz: $(GRAAL_BUILD_DIR)/%.diz 409 $(EXPORT_SERVER_DIR)/%.diz: $(JVMCI_BUILD_DIR)/%.diz
410 $(install-file) 410 $(install-file)
411 $(EXPORT_LIB_DIR)/%.jar: $(GRAAL_BUILD_DIR)/../generated/%.jar 411 $(EXPORT_LIB_DIR)/%.jar: $(JVMCI_BUILD_DIR)/../generated/%.jar
412 $(install-file) 412 $(install-file)
413 $(EXPORT_INCLUDE_DIR)/%: $(GRAAL_BUILD_DIR)/../generated/jvmtifiles/% 413 $(EXPORT_INCLUDE_DIR)/%: $(JVMCI_BUILD_DIR)/../generated/jvmtifiles/%
414 $(install-file) 414 $(install-file)
415 # Windows 415 # Windows
416 $(EXPORT_SERVER_DIR)/%.dll: $(GRAAL_BUILD_DIR)/%.dll 416 $(EXPORT_SERVER_DIR)/%.dll: $(JVMCI_BUILD_DIR)/%.dll
417 $(install-file) 417 $(install-file)
418 $(EXPORT_SERVER_DIR)/%.pdb: $(GRAAL_BUILD_DIR)/%.pdb 418 $(EXPORT_SERVER_DIR)/%.pdb: $(JVMCI_BUILD_DIR)/%.pdb
419 $(install-file) 419 $(install-file)
420 $(EXPORT_SERVER_DIR)/%.map: $(GRAAL_BUILD_DIR)/%.map 420 $(EXPORT_SERVER_DIR)/%.map: $(JVMCI_BUILD_DIR)/%.map
421 $(install-file) 421 $(install-file)
422 $(EXPORT_LIB_DIR)/%.lib: $(GRAAL_BUILD_DIR)/%.lib 422 $(EXPORT_LIB_DIR)/%.lib: $(JVMCI_BUILD_DIR)/%.lib
423 $(install-file) 423 $(install-file)
424 $(EXPORT_JRE_BIN_DIR)/%.diz: $(GRAAL_BUILD_DIR)/%.diz 424 $(EXPORT_JRE_BIN_DIR)/%.diz: $(JVMCI_BUILD_DIR)/%.diz
425 $(install-file) 425 $(install-file)
426 $(EXPORT_JRE_BIN_DIR)/%.dll: $(GRAAL_BUILD_DIR)/%.dll 426 $(EXPORT_JRE_BIN_DIR)/%.dll: $(JVMCI_BUILD_DIR)/%.dll
427 $(install-file) 427 $(install-file)
428 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(GRAAL_BUILD_DIR)/%.pdb 428 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(JVMCI_BUILD_DIR)/%.pdb
429 $(install-file) 429 $(install-file)
430 $(EXPORT_JRE_BIN_DIR)/%.map: $(GRAAL_BUILD_DIR)/%.map 430 $(EXPORT_JRE_BIN_DIR)/%.map: $(JVMCI_BUILD_DIR)/%.map
431 $(install-file) 431 $(install-file)
432 # Unix 432 # Unix
433 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(GRAAL_BUILD_DIR)/%.$(LIBRARY_SUFFIX) 433 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(JVMCI_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
434 $(install-file) 434 $(install-file)
435 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(GRAAL_BUILD_DIR)/%.$(LIBRARY_SUFFIX) 435 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(JVMCI_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
436 $(install-file) 436 $(install-file)
437 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(GRAAL_BUILD_DIR)/%.$(LIBRARY_SUFFIX) 437 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(JVMCI_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
438 $(install-file) 438 $(install-file)
439 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(GRAAL_BUILD_DIR)/%.debuginfo 439 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(JVMCI_BUILD_DIR)/%.debuginfo
440 $(install-file) 440 $(install-file)
441 $(EXPORT_SERVER_DIR)/%.debuginfo: $(GRAAL_BUILD_DIR)/%.debuginfo 441 $(EXPORT_SERVER_DIR)/%.debuginfo: $(JVMCI_BUILD_DIR)/%.debuginfo
442 $(install-file) 442 $(install-file)
443 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(GRAAL_BUILD_DIR)/%.debuginfo 443 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(JVMCI_BUILD_DIR)/%.debuginfo
444 $(install-file) 444 $(install-file)
445 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(GRAAL_BUILD_DIR)/%.diz 445 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(JVMCI_BUILD_DIR)/%.diz
446 $(install-file) 446 $(install-file)
447 $(EXPORT_SERVER_DIR)/64/%.diz: $(GRAAL_BUILD_DIR)/%.diz 447 $(EXPORT_SERVER_DIR)/64/%.diz: $(JVMCI_BUILD_DIR)/%.diz
448 $(install-file) 448 $(install-file)
449 # MacOS X 449 # MacOS X
450 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(GRAAL_BUILD_DIR)/%.dSYM 450 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(JVMCI_BUILD_DIR)/%.dSYM
451 $(install-dir) 451 $(install-dir)
452 $(EXPORT_SERVER_DIR)/%.dSYM: $(GRAAL_BUILD_DIR)/%.dSYM 452 $(EXPORT_SERVER_DIR)/%.dSYM: $(JVMCI_BUILD_DIR)/%.dSYM
453 $(install-dir) 453 $(install-dir)
454 454
455 endif 455 endif
456 456
457 # Client (C1) 457 # Client (C1)
630 $(install-file) 630 $(install-file)
631 631
632 $(EXPORT_JRE_LIB_EXT_DIR)/%.jar: $(SHARED_DIR)/%.jar 632 $(EXPORT_JRE_LIB_EXT_DIR)/%.jar: $(SHARED_DIR)/%.jar
633 $(install-file) 633 $(install-file)
634 634
635 $(EXPORT_JRE_LIB_GRAAL_DIR)/%.jar: $(SHARED_DIR)/%.jar 635 $(EXPORT_JRE_LIB_JVMCI_DIR)/%.jar: $(SHARED_DIR)/%.jar
636 $(install-file) 636 $(install-file)
637 637
638 $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/%: $(SHARED_DIR)/services/% 638 $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/%: $(SHARED_DIR)/services/%
639 $(install-file) 639 $(install-file)
640 640
641 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% 641 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
642 $(install-file) 642 $(install-file)
643 643
678 clean_build: 678 clean_build:
679 $(RM) -r $(SHARED_DIR) 679 $(RM) -r $(SHARED_DIR)
680 $(RM) -r $(C1_DIR) 680 $(RM) -r $(C1_DIR)
681 $(RM) -r $(C2_DIR) 681 $(RM) -r $(C2_DIR)
682 $(RM) -r $(CORE_DIR) 682 $(RM) -r $(CORE_DIR)
683 $(RM) -r $(GRAAL_DIR) 683 $(RM) -r $(JVMCI_DIR)
684 $(RM) -r $(ZERO_DIR) 684 $(RM) -r $(ZERO_DIR)
685 $(RM) -r $(SHARK_DIR) 685 $(RM) -r $(SHARK_DIR)
686 $(RM) -r $(MINIMAL1_DIR) 686 $(RM) -r $(MINIMAL1_DIR)
687 clean_export: 687 clean_export:
688 $(RM) -r $(EXPORT_PATH) 688 $(RM) -r $(EXPORT_PATH)
942 942
943 jvmgzero: warn_jvmg_deprecated debugzero 943 jvmgzero: warn_jvmg_deprecated debugzero
944 944
945 jvmgshark: warn_jvmg_deprecated debugshark 945 jvmgshark: warn_jvmg_deprecated debugshark
946 946
947 jvmggraal: warn_jvmg_deprecated debuggraal 947 jvmgjvmci: warn_jvmg_deprecated debugjvmci
948 948
949 # JPRT rule to build this workspace 949 # JPRT rule to build this workspace
950 include $(GAMMADIR)/make/jprt.gmk 950 include $(GAMMADIR)/make/jprt.gmk
951 951
952 .PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \ 952 .PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \