Mercurial > hg > truffle

comparison make/Makefile @ 14389:164db61dbced

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8016476: PPC64 (part 1): reenable CORE build Summary: reenable CORE build on PPC64 Reviewed-by: dholmes, kvn, coleenp
author goetz
date Wed, 19 Jun 2013 12:15:50 +0200
parents aabf54ccedb1
children b5c8a61d7fa0
comparison
equal deleted inserted replaced
10367:61dcf187a198 14389:164db61dbced
85 endif 85 endif
86 86
87 # Typical C1/C2 targets made available with this Makefile 87 # Typical C1/C2 targets made available with this Makefile
88 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1 88 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1
89 C2_VM_TARGETS=product fastdebug optimized debug 89 C2_VM_TARGETS=product fastdebug optimized debug
90 CORE_VM_TARGETS=productcore fastdebugcore optimizedcore debugcore
90 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero 91 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
91 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark 92 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
92 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1 93 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
93 94
94 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product 95 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
134 all_productshark: productshark docs export_product 135 all_productshark: productshark docs export_product
135 all_fastdebugshark: fastdebugshark docs export_fastdebug 136 all_fastdebugshark: fastdebugshark docs export_fastdebug
136 all_debugshark: debugshark docs export_debug 137 all_debugshark: debugshark docs export_debug
137 all_optimizedshark: optimizedshark docs export_optimized 138 all_optimizedshark: optimizedshark docs export_optimized
138 139
140 allcore: all_productcore all_fastdebugcore
141 all_productcore: productcore docs export_product
142 all_fastdebugcore: fastdebugcore docs export_fastdebug
143 all_debugcore: debugcore docs export_debug
144 all_optimizedcore: optimizedcore docs export_optimized
145
139 # Do everything 146 # Do everything
140 world: all create_jdk 147 world: all create_jdk
141 148
142 # Build or export docs 149 # Build or export docs
143 docs: 150 docs:
152 endif 159 endif
153 160
154 # Output directories 161 # Output directories
155 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 162 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
156 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 163 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
164 CORE_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_core
157 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1 165 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
158 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero 166 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero
159 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark 167 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark
160 168
161 # Build variation of hotspot 169 # Build variation of hotspot
164 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT) 172 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
165 173
166 $(C2_VM_TARGETS): 174 $(C2_VM_TARGETS):
167 $(CD) $(GAMMADIR)/make; \ 175 $(CD) $(GAMMADIR)/make; \
168 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) 176 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
177
178 $(CORE_VM_TARGETS):
179 $(CD) $(GAMMADIR)/make; \
180 $(MAKE) BUILD_DIR=$(CORE_DIR) BUILD_FLAVOR=$(@:$core=%) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
169 181
170 $(ZERO_VM_TARGETS): 182 $(ZERO_VM_TARGETS):
171 $(CD) $(GAMMADIR)/make; \ 183 $(CD) $(GAMMADIR)/make; \
172 $(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)
173 185
224 $(MAKE_ARGS) $(VM_TARGET) 236 $(MAKE_ARGS) $(VM_TARGET)
225 else 237 else
226 $(CD) $(OUTPUTDIR); \ 238 $(CD) $(OUTPUTDIR); \
227 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 239 $(MAKE) -f $(ABS_OS_MAKEFILE) \
228 $(MAKE_ARGS) $(VM_TARGET) 240 $(MAKE_ARGS) $(VM_TARGET)
241 endif
242
243 generic_buildcore: $(HOTSPOT_SCRIPT)
244 ifeq ($(HS_ARCH),ppc)
245 ifeq ($(ARCH_DATA_MODEL),64)
246 $(MKDIR) -p $(OUTPUTDIR)
247 $(CD) $(OUTPUTDIR); \
248 $(MAKE) -f $(ABS_OS_MAKEFILE) \
249 $(MAKE_ARGS) $(VM_TARGET)
250 else
251 @$(ECHO) "No ($(VM_TARGET)) for ppc ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
252 endif
253 else
254 @$(ECHO) "No ($(VM_TARGET)) for $(HS_ARCH)"
229 endif 255 endif
230 256
231 generic_buildzero: $(HOTSPOT_SCRIPT) 257 generic_buildzero: $(HOTSPOT_SCRIPT)
232 $(MKDIR) -p $(OUTPUTDIR) 258 $(MKDIR) -p $(OUTPUTDIR)
233 $(CD) $(OUTPUTDIR); \ 259 $(CD) $(OUTPUTDIR); \
285 # Export file copy rules 311 # Export file copy rules
286 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 312 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
287 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs 313 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
288 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR) 314 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR)
289 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR) 315 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR)
316 CORE_BUILD_DIR =$(CORE_DIR)/$(BUILD_FLAVOR)
290 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR) 317 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR)
291 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR) 318 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR)
292 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR) 319 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR)
293 320
294 # Server (C2) 321 # Server (C2)
443 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_BUILD_DIR)/%.$(LIBRARY_SUFFIX) 470 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
444 $(install-file) 471 $(install-file)
445 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo 472 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo
446 $(install-file) 473 $(install-file)
447 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz 474 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz
475 $(install-file)
476 endif
477
478 # Core
479 ifeq ($(JVM_VARIANT_CORE), true)
480 # Common
481 $(EXPORT_LIB_DIR)/%.jar: $(CORE_DIR)/../generated/%.jar
482 $(install-file)
483 $(EXPORT_INCLUDE_DIR)/%: $(CORE_DIR)/../generated/jvmtifiles/%
484 $(install-file)
485 # Unix
486 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX)
487 $(install-file)
488 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo
489 $(install-file)
490 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_DIR)/%.diz
491 $(install-file)
492 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX)
493 $(install-file)
494 $(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo
495 $(install-file)
496 $(EXPORT_SERVER_DIR)/%.diz: $(CORE_DIR)/%.diz
448 $(install-file) 497 $(install-file)
449 endif 498 endif
450 499
451 # Shark 500 # Shark
452 ifeq ($(JVM_VARIANT_ZEROSHARK), true) 501 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
508 # 557 #
509 clobber clean: clean_build clean_export clean_jdk 558 clobber clean: clean_build clean_export clean_jdk
510 clean_build: 559 clean_build:
511 $(RM) -r $(C1_DIR) 560 $(RM) -r $(C1_DIR)
512 $(RM) -r $(C2_DIR) 561 $(RM) -r $(C2_DIR)
562 $(RM) -r $(CORE_DIR)
513 $(RM) -r $(ZERO_DIR) 563 $(RM) -r $(ZERO_DIR)
514 $(RM) -r $(SHARK_DIR) 564 $(RM) -r $(SHARK_DIR)
515 $(RM) -r $(MINIMAL1_DIR) 565 $(RM) -r $(MINIMAL1_DIR)
516 clean_export: 566 clean_export:
517 $(RM) -r $(EXPORT_PATH) 567 $(RM) -r $(EXPORT_PATH)