Wed, 19 Jun 2013 12:15:50 +0200
8016476: PPC64 (part 1): reenable CORE build
Summary: reenable CORE build on PPC64
Reviewed-by: dholmes, kvn, coleenp
make/Makefile | file | annotate | diff | comparison | revisions |
1.1 --- a/make/Makefile Thu Jun 06 09:54:16 2013 -0700 1.2 +++ b/make/Makefile Wed Jun 19 12:15:50 2013 +0200 1.3 @@ -87,6 +87,7 @@ 1.4 # Typical C1/C2 targets made available with this Makefile 1.5 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1 1.6 C2_VM_TARGETS=product fastdebug optimized debug 1.7 +CORE_VM_TARGETS=productcore fastdebugcore optimizedcore debugcore 1.8 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero 1.9 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark 1.10 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1 1.11 @@ -136,6 +137,12 @@ 1.12 all_debugshark: debugshark docs export_debug 1.13 all_optimizedshark: optimizedshark docs export_optimized 1.14 1.15 +allcore: all_productcore all_fastdebugcore 1.16 +all_productcore: productcore docs export_product 1.17 +all_fastdebugcore: fastdebugcore docs export_fastdebug 1.18 +all_debugcore: debugcore docs export_debug 1.19 +all_optimizedcore: optimizedcore docs export_optimized 1.20 + 1.21 # Do everything 1.22 world: all create_jdk 1.23 1.24 @@ -154,6 +161,7 @@ 1.25 # Output directories 1.26 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 1.27 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 1.28 +CORE_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_core 1.29 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1 1.30 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero 1.31 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark 1.32 @@ -167,6 +175,10 @@ 1.33 $(CD) $(GAMMADIR)/make; \ 1.34 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) 1.35 1.36 +$(CORE_VM_TARGETS): 1.37 + $(CD) $(GAMMADIR)/make; \ 1.38 + $(MAKE) BUILD_DIR=$(CORE_DIR) BUILD_FLAVOR=$(@:$core=%) VM_TARGET=$@ generic_buildcore $(ALT_OUT) 1.39 + 1.40 $(ZERO_VM_TARGETS): 1.41 $(CD) $(GAMMADIR)/make; \ 1.42 $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT) 1.43 @@ -228,6 +240,20 @@ 1.44 $(MAKE_ARGS) $(VM_TARGET) 1.45 endif 1.46 1.47 +generic_buildcore: $(HOTSPOT_SCRIPT) 1.48 +ifeq ($(HS_ARCH),ppc) 1.49 + ifeq ($(ARCH_DATA_MODEL),64) 1.50 + $(MKDIR) -p $(OUTPUTDIR) 1.51 + $(CD) $(OUTPUTDIR); \ 1.52 + $(MAKE) -f $(ABS_OS_MAKEFILE) \ 1.53 + $(MAKE_ARGS) $(VM_TARGET) 1.54 + else 1.55 + @$(ECHO) "No ($(VM_TARGET)) for ppc ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" 1.56 + endif 1.57 +else 1.58 + @$(ECHO) "No ($(VM_TARGET)) for $(HS_ARCH)" 1.59 +endif 1.60 + 1.61 generic_buildzero: $(HOTSPOT_SCRIPT) 1.62 $(MKDIR) -p $(OUTPUTDIR) 1.63 $(CD) $(OUTPUTDIR); \ 1.64 @@ -287,6 +313,7 @@ 1.65 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs 1.66 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR) 1.67 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR) 1.68 +CORE_BUILD_DIR =$(CORE_DIR)/$(BUILD_FLAVOR) 1.69 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR) 1.70 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR) 1.71 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR) 1.72 @@ -448,6 +475,28 @@ 1.73 $(install-file) 1.74 endif 1.75 1.76 +# Core 1.77 +ifeq ($(JVM_VARIANT_CORE), true) 1.78 +# Common 1.79 +$(EXPORT_LIB_DIR)/%.jar: $(CORE_DIR)/../generated/%.jar 1.80 + $(install-file) 1.81 +$(EXPORT_INCLUDE_DIR)/%: $(CORE_DIR)/../generated/jvmtifiles/% 1.82 + $(install-file) 1.83 +# Unix 1.84 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX) 1.85 + $(install-file) 1.86 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo 1.87 + $(install-file) 1.88 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_DIR)/%.diz 1.89 + $(install-file) 1.90 +$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX) 1.91 + $(install-file) 1.92 +$(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo 1.93 + $(install-file) 1.94 +$(EXPORT_SERVER_DIR)/%.diz: $(CORE_DIR)/%.diz 1.95 + $(install-file) 1.96 +endif 1.97 + 1.98 # Shark 1.99 ifeq ($(JVM_VARIANT_ZEROSHARK), true) 1.100 # Common 1.101 @@ -510,6 +559,7 @@ 1.102 clean_build: 1.103 $(RM) -r $(C1_DIR) 1.104 $(RM) -r $(C2_DIR) 1.105 + $(RM) -r $(CORE_DIR) 1.106 $(RM) -r $(ZERO_DIR) 1.107 $(RM) -r $(SHARK_DIR) 1.108 $(RM) -r $(MINIMAL1_DIR)