Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/.hgtags	Mon Dec 05 12:50:00 2011 -0500
     1.2 +++ b/.hgtags	Tue Dec 06 05:28:17 2011 -0800
     1.3 @@ -197,3 +197,6 @@
     1.4  6534482ff68ad79066dfe15dfb6d8905f09681bd hs23-b04
     1.5  1d3900713a67a0a39faf4e12c9c158d55aebef87 jdk8-b12
     1.6  3e609627e780736f372eb14d29bb9b5e53b21fbf hs23-b05
     1.7 +b92ca8e229d29004f840c67e620833d23a346761 jdk8-b13
     1.8 +088d09a130ff02d8f5f05e92256baabe412f0439 jdk8-b14
     1.9 +6c2a55d4902f202e1c2de1df17b7da083a2c31e8 hs23-b06

     2.1 --- a/make/bsd/makefiles/buildtree.make	Mon Dec 05 12:50:00 2011 -0500
     2.2 +++ b/make/bsd/makefiles/buildtree.make	Tue Dec 06 05:28:17 2011 -0800
     2.3 @@ -55,6 +55,9 @@
     2.4  # The makefiles are split this way so that "make foo" will run faster by not
     2.5  # having to read the dependency files for the vm.
     2.6  
     2.7 +# needs to be set here since this Makefile doesn't include defs.make
     2.8 +OS_VENDOR:=$(shell uname -s)
     2.9 +
    2.10  include $(GAMMADIR)/make/scm.make
    2.11  include $(GAMMADIR)/make/altsrc.make
    2.12  
    2.13 @@ -159,8 +162,15 @@
    2.14    endif
    2.15  endif
    2.16  
    2.17 -# MACOSX FIXME: we should be able to run test_gamma (see MACOSX_PORT-214)
    2.18 -ifdef ALWAYS_PASS_TEST_GAMMA
    2.19 +ifeq ($(OS_VENDOR), Darwin)
    2.20 +  # MACOSX FIXME: we should be able to run test_gamma (see MACOSX_PORT-214)
    2.21 +  ifeq ($(ALWAYS_PASS_TEST_GAMMA),)
    2.22 +    # ALWAYS_PASS_TEST_GAMMA wasn't set so we default to true on MacOS X
    2.23 +    # until MACOSX_PORT-214 is fixed
    2.24 +    ALWAYS_PASS_TEST_GAMMA=true
    2.25 +  endif
    2.26 +endif
    2.27 +ifeq ($(ALWAYS_PASS_TEST_GAMMA), true)
    2.28    TEST_GAMMA_STATUS= echo 'exit 0';
    2.29  else
    2.30    TEST_GAMMA_STATUS=

     3.1 --- a/make/bsd/makefiles/sa.make	Mon Dec 05 12:50:00 2011 -0500
     3.2 +++ b/make/bsd/makefiles/sa.make	Tue Dec 06 05:28:17 2011 -0800
     3.3 @@ -37,11 +37,24 @@
     3.4  TOPDIR    = $(shell echo `pwd`)
     3.5  GENERATED = $(TOPDIR)/../generated
     3.6  
     3.7 -# tools.jar is needed by the JDI - SA binding
     3.8 -ifeq ($(SA_APPLE_BOOT_JAVA),true)
     3.9 -  SA_CLASSPATH = $(BOOT_JAVA_HOME)/bundle/Classes/classes.jar
    3.10 +# SA-JDI depends on the standard JDI classes.
    3.11 +# Default SA_CLASSPATH location:
    3.12 +DEF_SA_CLASSPATH=$(BOOT_JAVA_HOME)/lib/tools.jar
    3.13 +ifeq ($(ALT_SA_CLASSPATH),)
    3.14 +  # no alternate specified; see if default exists
    3.15 +  SA_CLASSPATH=$(shell test -f $(DEF_SA_CLASSPATH) && echo $(DEF_SA_CLASSPATH))
    3.16 +  ifeq ($(SA_CLASSPATH),)
    3.17 +    # the default doesn't exist
    3.18 +    ifeq ($(OS_VENDOR), Darwin)
    3.19 +      # A JDK from Apple doesn't have tools.jar; the JDI classes are
    3.20 +      # are in the regular classes.jar file.
    3.21 +      APPLE_JAR=$(BOOT_JAVA_HOME)/bundle/Classes/classes.jar
    3.22 +      SA_CLASSPATH=$(shell test -f $(APPLE_JAR) && echo $(APPLE_JAR))
    3.23 +    endif
    3.24 +  endif
    3.25  else
    3.26 -  SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
    3.27 +  _JUNK_ := $(shell echo >&2 "INFO: ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)")
    3.28 +  SA_CLASSPATH=$(shell test -f $(ALT_SA_CLASSPATH) && echo $(ALT_SA_CLASSPATH))
    3.29  endif
    3.30  
    3.31  # TODO: if it's a modules image, check if SA module is installed.
    3.32 @@ -72,8 +85,8 @@
    3.33  	  echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
    3.34  	  exit 1; \
    3.35  	fi
    3.36 -	$(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \
    3.37 -	  echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
    3.38 +	$(QUIETLY) if [ ! -f "$(SA_CLASSPATH)" -a ! -d $(MODULELIB_PATH) ] ; then \
    3.39 +	  echo "Cannot find JDI classes. Use 1.6.0 or later version of JDK."; \
    3.40  	  echo ""; \
    3.41  	  exit 1; \
    3.42  	fi