Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/Makefile	Mon Feb 13 02:29:22 2012 -0800
     1.2 +++ b/make/Makefile	Mon Feb 13 04:30:59 2012 -0800
     1.3 @@ -402,7 +402,6 @@
     1.4  	$(install-file)
     1.5  else
     1.6  $(EXPORT_INCLUDE_DIR)/jfr.h:
     1.7 -	
     1.8  endif
     1.9  
    1.10  # Doc files (jvmti.html)
    1.11 @@ -448,12 +447,18 @@
    1.12  	 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
    1.13  
    1.14  test_jdk:
    1.15 -  ifneq ($(ZERO_BUILD), true)
    1.16      ifeq ($(ARCH_DATA_MODEL), 32)
    1.17 -	$(JDK_IMAGE_DIR)/bin/java -client -version
    1.18 +      ifneq ($(ZERO_BUILD), true)
    1.19 +	$(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion
    1.20 +	$(JDK_IMAGE_DIR)/bin/java -d32 -client -version
    1.21 +      endif
    1.22 +	$(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion
    1.23 +	$(JDK_IMAGE_DIR)/bin/java -d32 -server -version
    1.24      endif
    1.25 -  endif
    1.26 -	$(JDK_IMAGE_DIR)/bin/java -server -version
    1.27 +    ifeq ($(ARCH_DATA_MODEL), 64)
    1.28 +	$(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion
    1.29 +	$(JDK_IMAGE_DIR)/bin/java -d64 -server -version
    1.30 +    endif
    1.31  
    1.32  copy_product_jdk::
    1.33  	$(RM) -r $(JDK_IMAGE_DIR)
    1.34 @@ -545,6 +550,7 @@
    1.35  OUTPUTDIR.desc             = Output directory, default is build/<osname>
    1.36  BOOTDIR.desc               = JDK used to compile agent java source and test with
    1.37  JDK_IMPORT_PATH.desc       = Promoted JDK to copy for 'create_jdk'
    1.38 +JDK_IMAGE_DIR.desc         = Directory to place JDK to copy
    1.39  EXPORT_PATH.desc           = Directory to place files to export for JDK build
    1.40  
    1.41  # Make variables to print out (description and value)
    1.42 @@ -553,6 +559,7 @@
    1.43      OUTPUTDIR                   \
    1.44      BOOTDIR                     \
    1.45      JDK_IMPORT_PATH             \
    1.46 +    JDK_IMAGE_DIR               \
    1.47      EXPORT_PATH
    1.48  
    1.49  # Make variables that should refer to directories that exist

     2.1 --- a/make/bsd/makefiles/defs.make	Mon Feb 13 02:29:22 2012 -0800
     2.2 +++ b/make/bsd/makefiles/defs.make	Mon Feb 13 04:30:59 2012 -0800
     2.3 @@ -191,6 +191,9 @@
     2.4  
     2.5      # Set universal image dir
     2.6      JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
     2.7 +    ifneq ($(ALT_JDK_IMAGE_DIR),)
     2.8 +      JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
     2.9 +    endif
    2.10  
    2.11      # Binaries to 'universalize' if built
    2.12      UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)

     3.1 --- a/make/bsd/makefiles/top.make	Mon Feb 13 02:29:22 2012 -0800
     3.2 +++ b/make/bsd/makefiles/top.make	Mon Feb 13 04:30:59 2012 -0800
     3.3 @@ -124,8 +124,8 @@
     3.4  	@$(UpdatePCH)
     3.5  	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
     3.6  
     3.7 -install: the_vm
     3.8 -	@$(MAKE) -f vm.make install
     3.9 +install gamma: the_vm
    3.10 +	@$(MAKE) -f vm.make $@
    3.11  
    3.12  # next rules support "make foo.[ois]"
    3.13  

     4.1 --- a/make/defs.make	Mon Feb 13 02:29:22 2012 -0800
     4.2 +++ b/make/defs.make	Mon Feb 13 04:30:59 2012 -0800
     4.3 @@ -193,6 +193,9 @@
     4.4  
     4.5  # Default jdk image if one is created for you with create_jdk
     4.6  JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
     4.7 +ifneq ($(ALT_JDK_IMAGE_DIR),)
     4.8 +  JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
     4.9 +endif
    4.10  
    4.11  # The platform dependent defs.make defines platform specific variable such 
    4.12  # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.

     5.1 --- a/make/linux/makefiles/top.make	Mon Feb 13 02:29:22 2012 -0800
     5.2 +++ b/make/linux/makefiles/top.make	Mon Feb 13 04:30:59 2012 -0800
     5.3 @@ -115,8 +115,8 @@
     5.4  	@$(UpdatePCH)
     5.5  	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
     5.6  
     5.7 -install: the_vm
     5.8 -	@$(MAKE) -f vm.make install
     5.9 +install gamma: the_vm
    5.10 +	@$(MAKE) -f vm.make $@
    5.11  
    5.12  # next rules support "make foo.[ois]"
    5.13  

     6.1 --- a/make/solaris/makefiles/top.make	Mon Feb 13 02:29:22 2012 -0800
     6.2 +++ b/make/solaris/makefiles/top.make	Mon Feb 13 04:30:59 2012 -0800
     6.3 @@ -107,8 +107,8 @@
     6.4  the_vm: vm_build_preliminaries $(adjust-mflags)
     6.5  	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
     6.6  
     6.7 -install: the_vm
     6.8 -	@$(MAKE) -f vm.make install
     6.9 +install gamma: the_vm
    6.10 +	@$(MAKE) -f vm.make $@
    6.11  
    6.12  # next rules support "make foo.[oi]"
    6.13