hotspot/make/Makefile

*** 83,92 ****
--- 83,93 ----
  # Typical C1/C2 targets made available with this Makefile
  C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
  C2_VM_TARGETS=product  fastdebug  optimized  jvmg
  KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
  ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
+ SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
  
  # JDK directory list
  JDK_DIRS=bin include jre lib demo
  
  all:           all_product all_fastdebug
*** 99,108 ****
--- 100,115 ----
  all_productzero:   productzero docs export_product
  all_fastdebugzero: fastdebugzero docs export_fastdebug
  all_debugzero:     jvmgzero docs export_debug
  all_optimizedzero: optimizedzero docs export_optimized
  
+ allshark:           all_productshark all_fastdebugshark
+ all_productshark:   productshark docs export_product
+ all_fastdebugshark: fastdebugshark docs export_fastdebug
+ all_debugshark:     jvmgshark docs export_debug
+ all_optimizedshark: optimizedshark docs export_optimized
+ 
  # Do everything
  world:         all create_jdk
  
  # Build or export docs
  docs:
*** 129,138 ****
--- 136,149 ----
  
  $(ZERO_VM_TARGETS):
          $(CD) $(GAMMADIR)/make; \
          $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
  
+ $(SHARK_VM_TARGETS):
+         $(CD) $(GAMMADIR)/make; \
+         $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
+ 
  # Build compiler1 (client) rule, different for platforms
  generic_build1:
          $(MKDIR) -p $(OUTPUTDIR)
  ifeq ($(OSNAME),windows)
    ifeq ($(ARCH_DATA_MODEL), 32)
*** 195,204 ****
--- 206,221 ----
          $(MKDIR) -p $(OUTPUTDIR)
          $(CD) $(OUTPUTDIR); \
                  $(MAKE) -f $(ABS_OS_MAKEFILE) \
                          $(MAKE_ARGS) $(VM_TARGET)
  
+ generic_buildshark:
+         $(MKDIR) -p $(OUTPUTDIR)
+         $(CD) $(OUTPUTDIR); \
+                 $(MAKE) -f $(ABS_OS_MAKEFILE) \
+                         $(MAKE_ARGS) $(VM_TARGET) 
+ 
  # Export file rule
  generic_export: $(EXPORT_LIST)
  export_product:
          $(MAKE) VM_SUBDIR=product                            generic_export
  export_fastdebug:
*** 226,244 ****
--- 243,268 ----
  DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
  C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
  C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
  KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
  ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
+ SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
  C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
  C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
  KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
  ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
+ SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
  
  # Misc files and generated files need to come from C1 or C2 area
  ifeq ($(ZERO_BUILD), true)
+ ifeq ($(SHARK_BUILD), true)
+   MISC_DIR=$(SHARK_DIR)
+   GEN_DIR=$(SHARK_BASE_DIR)/generated
+ else
    MISC_DIR=$(ZERO_DIR)
    GEN_DIR=$(ZERO_BASE_DIR)/generated
+ endif
  else
  ifeq ($(ARCH_DATA_MODEL), 32)
    MISC_DIR=$(C1_DIR)
    GEN_DIR=$(C1_BASE_DIR)/generated
  else
*** 288,301 ****
--- 312,332 ----
  endif
  
  # Shared Library
  ifneq ($(OSNAME),windows)
    ifeq ($(ZERO_BUILD), true)
+     ifeq ($(SHARK_BUILD), true)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so
+         $(install-file)
+ $(EXPORT_SERVER_DIR)/%.so:       $(SHARK_DIR)/%.so
+         $(install-file)
+     else
  $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
          $(install-file)
  $(EXPORT_SERVER_DIR)/%.so:       $(ZERO_DIR)/%.so
          $(install-file)
+     endif
    else
  $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
          $(install-file)
  $(EXPORT_CLIENT_DIR)/%.so:       $(C1_DIR)/%.so
          $(install-file)
*** 346,355 ****
--- 377,387 ----
  clean_build:
          $(RM) -r $(C1_DIR)
          $(RM) -r $(C2_DIR)
          $(RM) -r $(KERNEL_DIR)
          $(RM) -r $(ZERO_DIR)
+         $(RM) -r $(SHARK_DIR)
  clean_export:
          $(RM) -r $(EXPORT_PATH)
  clean_jdk:
          $(RM) -r $(JDK_IMAGE_DIR)