make/linux/Makefile

*** 173,182 ****
--- 173,186 ----
  #       jvmgshark       shark           <os>_<arch>_shark/jvmg
  #       optimizedshark  shark           <os>_<arch>_shark/optimized
  #       profiledshark   shark           <os>_<arch>_shark/profiled
  #       productshark    shark           <os>_<arch>_shark/product
  #
+ #       fastdebugminimal1 minimal1      <os>_<arch>_minimal1/fastdebug
+ #       jvmgminimal1      minimal1      <os>_<arch>_minimal1/jvmg
+ #       productminimal1   minimal1      <os>_<arch>_minimal1/product
+ #
  # What you get with each target:
  #
  # debug*     - "thin" libjvm_g - debug info linked into the gamma_g launcher
  # fastdebug* - optimized compile, but with asserts enabled
  # jvmg*      - "fat" libjvm_g - debug info linked into libjvm_g.so
*** 197,213 ****
--- 201,219 ----
  SUBDIRS_C2        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
  SUBDIRS_TIERED    = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
  SUBDIRS_CORE      = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
  SUBDIRS_ZERO      = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
  SUBDIRS_SHARK     = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
+ SUBDIRS_MINIMAL1  = $(addprefix $(OSNAME)_$(BUILDARCH)_minimal1/,$(TARGETS))
  
  TARGETS_C2        = $(TARGETS)
  TARGETS_C1        = $(addsuffix 1,$(TARGETS))
  TARGETS_TIERED    = $(addsuffix tiered,$(TARGETS))
  TARGETS_CORE      = $(addsuffix core,$(TARGETS))
  TARGETS_ZERO      = $(addsuffix zero,$(TARGETS))
  TARGETS_SHARK     = $(addsuffix shark,$(TARGETS))
+ TARGETS_MINIMAL1 =  $(addsuffix minimal1,$(TARGETS))
  
  BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
  BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
  BUILDTREE_VARS   += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
  BUILDTREE_VARS   += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
*** 222,231 ****
--- 228,238 ----
          @echo "  $(TARGETS_C2)"
          @echo "  $(TARGETS_C1)"
          @echo "  $(TARGETS_CORE)"
          @echo "  $(TARGETS_ZERO)"
          @echo "  $(TARGETS_SHARK)"
+         @echo "  $(TARGETS_MINIMAL1)"
  
  checks: check_os_version check_j2se_version
  
  # We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
  # Solaris 2.5.1, 2.6).
*** 279,288 ****
--- 286,300 ----
  
  $(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
          $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
          $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
  
+ $(SUBDIRS_MINIMAL1): $(BUILDTREE_MAKE)
+         $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+         $(BUILDTREE) VARIANT=minimal1
+ 
+ 
  platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
          $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
  
  # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
  
*** 326,341 ****
--- 338,361 ----
          cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
  ifdef INSTALL
          cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
  endif
  
+ $(TARGETS_MINIMAL1):  $(SUBDIRS_MINIMAL1)
+         cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS)
+         cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && ./test_gamma
+ ifdef INSTALL
+         cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+ 
  # Just build the tree, and nothing else:
  tree:      $(SUBDIRS_C2)
  tree1:     $(SUBDIRS_C1)
  treecore:  $(SUBDIRS_CORE)
  treezero:  $(SUBDIRS_ZERO)
  treeshark: $(SUBDIRS_SHARK)
+ treeminimal1: $(SUBDIRS_MINIMAL1)
  
  # Doc target.  This is the same for all build options.
  #     Hence create a docs directory beside ...$(ARCH)_[...]
  # We specify 'BUILD_FLAVOR=product' so that the proper
  # ENABLE_FULL_DEBUG_SYMBOLS value is used.
*** 355,373 ****
  shark: jvmgshark productshark
  
  clean_docs:
          rm -rf $(SUBDIR_DOCS)
  
! clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark:
          rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
  
! clean:  clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_docs
  
  include $(GAMMADIR)/make/cscope.make
  
  #-------------------------------------------------------------------------------
  
! .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK)
  .PHONY: tree tree1 treecore treezero treeshark
  .PHONY: all compiler1 compiler2 core zero shark
  .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs
  .PHONY: checks check_os_version check_j2se_version
--- 375,399 ----
  shark: jvmgshark productshark
  
  clean_docs:
          rm -rf $(SUBDIR_DOCS)
  
! clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark clean_minimal1:
          rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
  
! clean:  clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_minimal1 clean_docs
  
  include $(GAMMADIR)/make/cscope.make
  
+ #
+ # Include alternate Makefile if it exists.
+ #
+ -include $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make
+ 
  #-------------------------------------------------------------------------------
  
! .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) $(TARGETS_MINIMAL1)
  .PHONY: tree tree1 treecore treezero treeshark
  .PHONY: all compiler1 compiler2 core zero shark
  .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs
  .PHONY: checks check_os_version check_j2se_version
+ .PHONY: $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make