comparison make/Makefile @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents 4c9f24b8f002
children 942e4b7712e1
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
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 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal
94 CORE_VM_TARGETS=productcore fastdebugcore optimizedcore debugcore
95 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero 93 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
96 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark 94 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
97 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1 95 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
96 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal
98 97
99 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product 98 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
100 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug 99 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
101 COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug 100 COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug
102 101
127 endif 126 endif
128 endif 127 endif
129 128
130 all_optimized: optimized optimized1 docs export_optimized 129 all_optimized: optimized optimized1 docs export_optimized
131 130
131 allzero: all_productzero all_fastdebugzero
132 all_productzero: productzero docs export_product
133 all_fastdebugzero: fastdebugzero docs export_fastdebug
134 all_debugzero: debugzero docs export_debug
135 all_optimizedzero: optimizedzero docs export_optimized
136
137 allshark: all_productshark all_fastdebugshark
138 all_productshark: productshark docs export_product
139 all_fastdebugshark: fastdebugshark docs export_fastdebug
140 all_debugshark: debugshark docs export_debug
141 all_optimizedshark: optimizedshark docs export_optimized
142
132 allgraal: all_productgraal all_fastdebuggraal 143 allgraal: all_productgraal all_fastdebuggraal
133 all_productgraal: productgraal docs export_product 144 all_productgraal: productgraal docs export_product
134 all_fastdebuggraal: fastdebuggraal docs export_fastdebug 145 all_fastdebuggraal: fastdebuggraal docs export_fastdebug
135 all_debuggraal: debuggraal docs export_debug 146 all_debuggraal: debuggraal docs export_debug
136 all_optimizedgraal: optimizedgraal docs export_optimized 147 all_optimizedgraal: optimizedgraal docs export_optimized
137
138 allzero: all_productzero all_fastdebugzero
139 all_productzero: productzero docs export_product
140 all_fastdebugzero: fastdebugzero docs export_fastdebug
141 all_debugzero: debugzero docs export_debug
142 all_optimizedzero: optimizedzero docs export_optimized
143
144 allshark: all_productshark all_fastdebugshark
145 all_productshark: productshark docs export_product
146 all_fastdebugshark: fastdebugshark docs export_fastdebug
147 all_debugshark: debugshark docs export_debug
148 all_optimizedshark: optimizedshark docs export_optimized
149
150 allcore: all_productcore all_fastdebugcore
151 all_productcore: productcore docs export_product
152 all_fastdebugcore: fastdebugcore docs export_fastdebug
153 all_debugcore: debugcore docs export_debug
154 all_optimizedcore: optimizedcore docs export_optimized
155 148
156 # Do everything 149 # Do everything
157 world: all create_jdk 150 world: all create_jdk
158 151
159 # Build or export docs 152 # Build or export docs
170 163
171 # Output directories 164 # Output directories
172 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 165 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
173 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 166 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
174 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal 167 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal
175 CORE_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_core
176 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1 168 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
177 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero 169 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero
178 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark 170 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark
171 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal
179 172
180 # Build variation of hotspot 173 # Build variation of hotspot
181 $(C1_VM_TARGETS): 174 $(C1_VM_TARGETS):
182 $(CD) $(GAMMADIR)/make; \ 175 $(CD) $(GAMMADIR)/make; \
183 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT) 176 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
184 177
185 $(C2_VM_TARGETS): 178 $(C2_VM_TARGETS):
186 $(CD) $(GAMMADIR)/make; \ 179 $(CD) $(GAMMADIR)/make; \
187 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) 180 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
188
189 $(CORE_VM_TARGETS):
190 $(CD) $(GAMMADIR)/make; \
191 $(MAKE) BUILD_DIR=$(CORE_DIR) BUILD_FLAVOR=$(@:%core=%) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
192 181
193 $(ZERO_VM_TARGETS): 182 $(ZERO_VM_TARGETS):
194 $(CD) $(GAMMADIR)/make; \ 183 $(CD) $(GAMMADIR)/make; \
195 $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT) 184 $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
196 185
249 $(CD) $(OUTPUTDIR); \ 238 $(CD) $(OUTPUTDIR); \
250 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 239 $(MAKE) -f $(ABS_OS_MAKEFILE) \
251 $(MAKE_ARGS) $(VM_TARGET) 240 $(MAKE_ARGS) $(VM_TARGET)
252 endif 241 endif
253 242
254 generic_buildcore: $(HOTSPOT_SCRIPT)
255 ifeq ($(HS_ARCH),ppc)
256 ifeq ($(ARCH_DATA_MODEL),64)
257 $(MKDIR) -p $(OUTPUTDIR)
258 $(CD) $(OUTPUTDIR); \
259 $(MAKE) -f $(ABS_OS_MAKEFILE) \
260 $(MAKE_ARGS) $(VM_TARGET)
261 else
262 @$(ECHO) "No ($(VM_TARGET)) for ppc ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
263 endif
264 else
265 @$(ECHO) "No ($(VM_TARGET)) for $(HS_ARCH)"
266 endif
267
268 generic_buildzero: $(HOTSPOT_SCRIPT) 243 generic_buildzero: $(HOTSPOT_SCRIPT)
269 $(MKDIR) -p $(OUTPUTDIR) 244 $(MKDIR) -p $(OUTPUTDIR)
270 $(CD) $(OUTPUTDIR); \ 245 $(CD) $(OUTPUTDIR); \
271 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 246 $(MAKE) -f $(ABS_OS_MAKEFILE) \
272 $(MAKE_ARGS) $(VM_TARGET) 247 $(MAKE_ARGS) $(VM_TARGET)
334 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 309 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
335 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs 310 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
336 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR) 311 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR)
337 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR) 312 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR)
338 GRAAL_BUILD_DIR =$(GRAAL_DIR)/$(BUILD_FLAVOR) 313 GRAAL_BUILD_DIR =$(GRAAL_DIR)/$(BUILD_FLAVOR)
339 CORE_BUILD_DIR =$(CORE_DIR)/$(BUILD_FLAVOR)
340 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR) 314 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR)
341 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR) 315 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR)
342 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR) 316 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR)
343 317
344 # Server (C2) and Graal 318 # Server (C2) and Graal
559 # MacOS X 533 # MacOS X
560 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM 534 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM
561 $(install-dir) 535 $(install-dir)
562 $(EXPORT_SERVER_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM 536 $(EXPORT_SERVER_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM
563 $(install-dir) 537 $(install-dir)
564 endif
565
566 # Core
567 ifeq ($(JVM_VARIANT_CORE), true)
568 # Common
569 $(EXPORT_LIB_DIR)/%.jar: $(CORE_BUILD_DIR)/../generated/%.jar
570 $(install-file)
571 $(EXPORT_INCLUDE_DIR)/%: $(CORE_BUILD_DIR)/../generated/jvmtifiles/%
572 $(install-file)
573 # Unix
574 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
575 $(install-file)
576 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_BUILD_DIR)/%.debuginfo
577 $(install-file)
578 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_BUILD_DIR)/%.diz
579 $(install-file)
580 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
581 $(install-file)
582 $(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_BUILD_DIR)/%.debuginfo
583 $(install-file)
584 $(EXPORT_SERVER_DIR)/%.diz: $(CORE_BUILD_DIR)/%.diz
585 $(install-file)
586 endif 538 endif
587 539
588 # Shark 540 # Shark
589 ifeq ($(JVM_VARIANT_ZEROSHARK), true) 541 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
590 # Common 542 # Common
655 clean_build: 607 clean_build:
656 $(RM) -r $(SHARED_DIR) 608 $(RM) -r $(SHARED_DIR)
657 $(RM) -r $(C1_DIR) 609 $(RM) -r $(C1_DIR)
658 $(RM) -r $(C2_DIR) 610 $(RM) -r $(C2_DIR)
659 $(RM) -r $(GRAAL_DIR) 611 $(RM) -r $(GRAAL_DIR)
660 $(RM) -r $(CORE_DIR)
661 $(RM) -r $(ZERO_DIR) 612 $(RM) -r $(ZERO_DIR)
662 $(RM) -r $(SHARK_DIR) 613 $(RM) -r $(SHARK_DIR)
663 $(RM) -r $(MINIMAL1_DIR) 614 $(RM) -r $(MINIMAL1_DIR)
664 clean_export: 615 clean_export:
665 $(RM) -r $(EXPORT_PATH) 616 $(RM) -r $(EXPORT_PATH)
682 $(TAR) -cf - *) | \ 633 $(TAR) -cf - *) | \
683 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -) 634 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
684 635
685 636
686 # Testing the built JVM 637 # Testing the built JVM
687 RUN_JVM=JAVA_HOME=$(JDK_IMPORT_PATH) $(JDK_IMPORT_PATH)/bin/java -d$(ARCH_DATA_MODEL) -XXaltjvm=$(ALTJVM_DIR) -Dsun.java.launcher.is_altjvm=true 638 RUN_JVM=JAVA_HOME=$(JDK_IMPORT_PATH) $(JDK_IMPORT_PATH)/bin/java -d$(ARCH_DATA_MODEL) -Dsun.java.launcher=gamma
688 generic_test: 639 generic_test:
689 @$(ECHO) "Running with: $(ALTJVM_DIR)" 640 @$(ECHO) "Running with: $(ALTJVM_DIR)"
690 @$(RUN_JVM) -Xinternalversion 641 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion
691 @$(RUN_JVM) -showversion -help 642 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help
692 643
693 # C2 test targets 644 # C2 test targets
694 test_product test_optimized test_fastdebug test_debug: 645 test_product test_optimized test_fastdebug test_debug:
695 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)" 646 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)"
696 647