Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/linux/Makefile	Thu Nov 04 12:16:58 2010 -0700
     1.2 +++ b/make/linux/Makefile	Fri Nov 05 14:49:50 2010 -0700
     1.3 @@ -62,7 +62,9 @@
     1.4  include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
     1.5  
     1.6  ifndef CC_INTERP
     1.7 -FORCE_TIERED=1
     1.8 +  ifndef FORCE_TIERED
     1.9 +    FORCE_TIERED=1
    1.10 +  endif
    1.11  endif
    1.12  
    1.13  ifdef LP64
    1.14 @@ -254,7 +256,7 @@
    1.15  	$(BUILDTREE) VARIANT=tiered
    1.16  
    1.17  $(SUBDIRS_C2): $(BUILDTREE_MAKE)
    1.18 -ifdef FORCE_TIERED
    1.19 +ifeq ($(FORCE_TIERED),1)
    1.20  	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
    1.21  		$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
    1.22  else

     2.1 --- a/make/solaris/Makefile	Thu Nov 04 12:16:58 2010 -0700
     2.2 +++ b/make/solaris/Makefile	Fri Nov 05 14:49:50 2010 -0700
     2.3 @@ -53,7 +53,9 @@
     2.4  include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
     2.5  
     2.6  ifndef CC_INTERP
     2.7 -FORCE_TIERED=1
     2.8 +  ifndef FORCE_TIERED
     2.9 +    FORCE_TIERED=1
    2.10 +  endif
    2.11  endif
    2.12  
    2.13  ifdef LP64
    2.14 @@ -210,7 +212,7 @@
    2.15  	$(BUILDTREE) VARIANT=tiered
    2.16  
    2.17  $(SUBDIRS_C2): $(BUILDTREE_MAKE)
    2.18 -ifdef FORCE_TIERED
    2.19 +ifeq ($(FORCE_TIERED),1)
    2.20  	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
    2.21  		$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
    2.22  else

     3.1 --- a/make/windows/build.make	Thu Nov 04 12:16:58 2010 -0700
     3.2 +++ b/make/windows/build.make	Fri Nov 05 14:49:50 2010 -0700
     3.3 @@ -74,9 +74,11 @@
     3.4  
     3.5  !if "$(BUILDARCH)" != "ia64"
     3.6  !ifndef CC_INTERP
     3.7 +!ifndef FORCE_TIERED
     3.8  FORCE_TIERED=1
     3.9  !endif
    3.10  !endif
    3.11 +!endif
    3.12  
    3.13  !if "$(BUILDARCH)" == "amd64"
    3.14  Platform_arch=x86
    3.15 @@ -100,7 +102,7 @@
    3.16  !if "$(Variant)" == "compiler1"
    3.17  VARIANT_TEXT=Client
    3.18  !elseif "$(Variant)" == "compiler2"
    3.19 -!ifdef FORCE_TIERED
    3.20 +!if "$(FORCE_TIERED)" == "1"
    3.21  VARIANT_TEXT=Server
    3.22  realVariant=tiered
    3.23  !else

     4.1 --- a/src/share/vm/runtime/java.cpp	Thu Nov 04 12:16:58 2010 -0700
     4.2 +++ b/src/share/vm/runtime/java.cpp	Fri Nov 05 14:49:50 2010 -0700
     4.3 @@ -198,7 +198,7 @@
     4.4    if (CountCompiledCalls) {
     4.5      print_method_invocation_histogram();
     4.6    }
     4.7 -  if (ProfileInterpreter || C1UpdateMethodData) {
     4.8 +  if (ProfileInterpreter COMPILER1_PRESENT(|| C1UpdateMethodData)) {
     4.9      print_method_profiling_data();
    4.10    }
    4.11    if (TimeCompiler) {