make/Makefile

Print this page

        

@@ -83,11 +83,11 @@
 endif
 
 # 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
+MINIMAL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
 
 COMMON_VM_PRODUCT_TARGETS=product product1 productkernel docs export_product
 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 fastdebugkernel docs export_fastdebug

@@ -148,11 +148,11 @@
 
 $(C2_VM_TARGETS):
         $(CD) $(GAMMADIR)/make; \
         $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
 
-$(KERNEL_VM_TARGETS):
+$(MINIMAL_VM_TARGETS):
         $(CD) $(GAMMADIR)/make; \
         $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
 
 $(ZERO_VM_TARGETS):
         $(CD) $(GAMMADIR)/make; \

@@ -260,36 +260,38 @@
 # Export file copy rules
 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
 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
+MINIMAL_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)
+MINIMAL_DIR=$(MINIMAL_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
+ifeq ($(JVM_VARIANT_SERVER), true)
+    MISC_DIR=$(C2_DIR)
+    GEN_DIR=$(C2_BASE_DIR)/generated
 endif
-else
-ifeq ($(ARCH_DATA_MODEL), 32)
+ifeq ($(JVM_VARIANT_CLIENT), true)
   MISC_DIR=$(C1_DIR)
   GEN_DIR=$(C1_BASE_DIR)/generated
-else
+endif
+ifeq ($(JVM_VARIANT_MINIMAL), true)
   MISC_DIR=$(C2_DIR)
   GEN_DIR=$(C2_BASE_DIR)/generated
 endif
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+    MISC_DIR=$(SHARK_DIR)
+    GEN_DIR=$(SHARK_BASE_DIR)/generated
+endif
+ifeq ($(JVM_VARIANT_ZERO), true)
+    MISC_DIR=$(ZERO_DIR)
+    GEN_DIR=$(ZERO_BASE_DIR)/generated
 endif
 
 # Bin files (windows)
 ifeq ($(OSNAME),windows)
 

@@ -320,58 +322,58 @@
         $(install-file)
 $(EXPORT_SERVER_DIR)/%.map:  $(C2_DIR)/%.map
         $(install-file)
 
 # Kernel files always come from kernel area
-$(EXPORT_KERNEL_DIR)/%.dll:  $(KERNEL_DIR)/%.dll
+$(EXPORT_MINIMAL_DIR)/%.dll:  $(MINIMAL_DIR)/%.dll
         $(install-file)
-$(EXPORT_KERNEL_DIR)/%.pdb:  $(KERNEL_DIR)/%.pdb
+$(EXPORT_MINIMAL_DIR)/%.pdb:  $(MINIMAL_DIR)/%.pdb
         $(install-file)
-$(EXPORT_KERNEL_DIR)/%.map:  $(KERNEL_DIR)/%.map
+$(EXPORT_MINIMAL_DIR)/%.map:  $(MINIMAL_DIR)/%.map
         $(install-file)
 endif
 
 # Shared Library
 ifneq ($(OSNAME),windows)
-  ifeq ($(ZERO_BUILD), true)
-    ifeq ($(SHARK_BUILD), true)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
+    ifeq ($(JVM_VARIANT_SERVER), true)
+        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
-$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
+        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(C2_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
-    else
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
+        $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C2_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
-$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
+        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:                 $(C2_DIR)/%.debuginfo
         $(install-file)
-    endif
-  else
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+        $(EXPORT_SERVER_DIR)/%.debuginfo:                       $(C2_DIR)/%.debuginfo
         $(install-file)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+        $(EXPORT_SERVER_DIR)/64/%.debuginfo:                    $(C2_DIR)/%.debuginfo
         $(install-file)
-$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX):       $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+    endif
+    ifeq ($(JVM_VARIANT_CLIENT), true)
+        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
-$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+        $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX):       $(C1_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
-$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+        $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C1_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
-$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:                 $(C1_DIR)/%.debuginfo
         $(install-file)
-
-# Debug info for shared library
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
+        $(EXPORT_CLIENT_DIR)/%.debuginfo:                       $(C1_DIR)/%.debuginfo
         $(install-file)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
+        $(EXPORT_CLIENT_DIR)/64/%.debuginfo:                    $(C1_DIR)/%.debuginfo
         $(install-file)
-$(EXPORT_CLIENT_DIR)/%.debuginfo:       $(C1_DIR)/%.debuginfo
+    endif
+    ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
-$(EXPORT_CLIENT_DIR)/64/%.debuginfo:    $(C1_DIR)/%.debuginfo
+        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
-$(EXPORT_SERVER_DIR)/%.debuginfo:       $(C2_DIR)/%.debuginfo
+    endif
+    ifeq ($(JVM_VARIANT_ZERO), true)
+        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
-$(EXPORT_SERVER_DIR)/64/%.debuginfo:    $(C2_DIR)/%.debuginfo
+        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
         $(install-file)
   endif
 endif
 
 # Jar file (sa-jdi.jar)

@@ -410,11 +412,11 @@
 # Doc files (jvmti.html)
 $(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/%
         $(install-file)
 
 # Xusage file
-$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
+$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_MINIMAL_DIR)/Xusage.txt: $(XUSAGE)
         $(prep-target)
         $(RM) $@.temp
         $(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
         $(MV) $@.temp $@
 

@@ -423,11 +425,11 @@
 #
 clobber clean: clean_build clean_export clean_jdk
 clean_build:
         $(RM) -r $(C1_DIR)
         $(RM) -r $(C2_DIR)
-        $(RM) -r $(KERNEL_DIR)
+        $(RM) -r $(MINIMAL_DIR)
         $(RM) -r $(ZERO_DIR)
         $(RM) -r $(SHARK_DIR)
 clean_export:
         $(RM) -r $(EXPORT_PATH)
 clean_jdk:

@@ -448,21 +450,22 @@
         ($(CD) $(JDK_IMPORT_PATH) && \
          $(TAR) -cf - *) | \
          ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
 
 test_jdk:
-    ifeq ($(ARCH_DATA_MODEL), 32)
-      ifneq ($(ZERO_BUILD), true)
-        $(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion
-        $(JDK_IMAGE_DIR)/bin/java -d32 -client -version
+  ifeq ($(JVM_VARIANT_CLIENT), true)
+        $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion
+        $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version
       endif
-        $(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion
-        $(JDK_IMAGE_DIR)/bin/java -d32 -server -version
+  ifeq ($(findstring true, $(JVM_VARIANT_SERVER)\
+                $(JVM_VARIANT_ZERO)$(JVM_VARIANT_ZEROSHARK)), true)
+        $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -Xinternalversion
+        $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -version
     endif
-    ifeq ($(ARCH_DATA_MODEL), 64)
-        $(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion
-        $(JDK_IMAGE_DIR)/bin/java -d64 -server -version
+  ifeq ($(JVM_VARIANT_MINIMAL), true)
+        $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -Xinternalversion
+        $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -version
     endif
 
 copy_product_jdk::
         $(RM) -r $(JDK_IMAGE_DIR)
         $(MKDIR) -p $(JDK_IMAGE_DIR)

@@ -535,11 +538,11 @@
         @$(ECHO) "update_jdk:       Update JDK image with fresh exported files"
         @$(ECHO) " "
         @$(ECHO) "Others targets are:"
         @$(ECHO) "   $(C1_VM_TARGETS)"
         @$(ECHO) "   $(C2_VM_TARGETS)"
-        @$(ECHO) "   $(KERNEL_VM_TARGETS)"
+        @$(ECHO) "   $(MINIMAL_VM_TARGETS)"
 
 # Variable help (only common ones used by this workspace)
 variable_help: variable_help_intro variable_list variable_help_end
 variable_help_intro:
         @$(ECHO) "--- Common Variables ---"

@@ -630,11 +633,11 @@
 
 # JPRT rule to build this workspace
 include $(GAMMADIR)/make/jprt.gmk
 
 .PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \
-        $(KERNEL_VM_TARGETS) \
+        $(MINIMAL_VM_TARGETS) \
         generic_build1 generic_build2 generic_buildkernel generic_export \
         export_product export_fastdebug export_debug export_optimized \
         export_jdk_product export_jdk_fastdebug export_jdk_debug \
         create_jdk copy_jdk update_jdk test_jdk \
         copy_product_jdk copy_fastdebug_jdk copy_debug_jdk