1.1 --- a/make/Makefile Wed Aug 11 01:17:27 2010 -0700
1.2 +++ b/make/Makefile Wed Aug 11 05:51:21 2010 -0700
1.3 @@ -85,6 +85,7 @@
1.4 C2_VM_TARGETS=product fastdebug optimized jvmg
1.5 KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
1.6 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
1.7 +SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
1.8
1.9 # JDK directory list
1.10 JDK_DIRS=bin include jre lib demo
1.11 @@ -107,6 +108,12 @@
1.12 all_debugzero: jvmgzero docs export_debug
1.13 all_optimizedzero: optimizedzero docs export_optimized
1.14
1.15 +allshark: all_productshark all_fastdebugshark
1.16 +all_productshark: productshark docs export_product
1.17 +all_fastdebugshark: fastdebugshark docs export_fastdebug
1.18 +all_debugshark: jvmgshark docs export_debug
1.19 +all_optimizedshark: optimizedshark docs export_optimized
1.20 +
1.21 # Do everything
1.22 world: all create_jdk
1.23
1.24 @@ -137,6 +144,10 @@
1.25 $(CD) $(GAMMADIR)/make; \
1.26 $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
1.27
1.28 +$(SHARK_VM_TARGETS):
1.29 + $(CD) $(GAMMADIR)/make; \
1.30 + $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
1.31 +
1.32 # Build compiler1 (client) rule, different for platforms
1.33 generic_build1:
1.34 $(MKDIR) -p $(OUTPUTDIR)
1.35 @@ -203,6 +214,12 @@
1.36 $(MAKE) -f $(ABS_OS_MAKEFILE) \
1.37 $(MAKE_ARGS) $(VM_TARGET)
1.38
1.39 +generic_buildshark:
1.40 + $(MKDIR) -p $(OUTPUTDIR)
1.41 + $(CD) $(OUTPUTDIR); \
1.42 + $(MAKE) -f $(ABS_OS_MAKEFILE) \
1.43 + $(MAKE_ARGS) $(VM_TARGET)
1.44 +
1.45 # Export file rule
1.46 generic_export: $(EXPORT_LIST)
1.47 export_product:
1.48 @@ -234,15 +251,22 @@
1.49 C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
1.50 KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
1.51 ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
1.52 +SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
1.53 C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
1.54 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
1.55 KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
1.56 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
1.57 +SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
1.58
1.59 # Misc files and generated files need to come from C1 or C2 area
1.60 ifeq ($(ZERO_BUILD), true)
1.61 +ifeq ($(SHARK_BUILD), true)
1.62 + MISC_DIR=$(SHARK_DIR)
1.63 + GEN_DIR=$(SHARK_BASE_DIR)/generated
1.64 +else
1.65 MISC_DIR=$(ZERO_DIR)
1.66 GEN_DIR=$(ZERO_BASE_DIR)/generated
1.67 +endif
1.68 else
1.69 ifeq ($(ARCH_DATA_MODEL), 32)
1.70 MISC_DIR=$(C1_DIR)
1.71 @@ -296,10 +320,17 @@
1.72 # Shared Library
1.73 ifneq ($(OSNAME),windows)
1.74 ifeq ($(ZERO_BUILD), true)
1.75 + ifeq ($(SHARK_BUILD), true)
1.76 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so
1.77 + $(install-file)
1.78 +$(EXPORT_SERVER_DIR)/%.so: $(SHARK_DIR)/%.so
1.79 + $(install-file)
1.80 + else
1.81 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
1.82 $(install-file)
1.83 $(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so
1.84 $(install-file)
1.85 + endif
1.86 else
1.87 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C1_DIR)/%.so
1.88 $(install-file)
1.89 @@ -356,6 +387,7 @@
1.90 $(RM) -r $(C2_DIR)
1.91 $(RM) -r $(KERNEL_DIR)
1.92 $(RM) -r $(ZERO_DIR)
1.93 + $(RM) -r $(SHARK_DIR)
1.94 clean_export:
1.95 $(RM) -r $(EXPORT_PATH)
1.96 clean_jdk:
