Mercurial > hg > graal-jvmci-8
changeset 1919:d0895dfaf7cc
Merge
author | iveresov |
---|---|
date | Sat, 06 Nov 2010 02:53:59 -0700 |
parents | 34bd82eba3bb (diff) f42a2f0c16bb (current diff) |
children | 2fe998383789 |
files | |
diffstat | 4 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/Makefile Fri Nov 05 12:18:30 2010 -0700 +++ b/make/linux/Makefile Sat Nov 06 02:53:59 2010 -0700 @@ -62,7 +62,9 @@ include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make ifndef CC_INTERP -FORCE_TIERED=1 + ifndef FORCE_TIERED + FORCE_TIERED=1 + endif endif ifdef LP64 @@ -254,7 +256,7 @@ $(BUILDTREE) VARIANT=tiered $(SUBDIRS_C2): $(BUILDTREE_MAKE) -ifdef FORCE_TIERED +ifeq ($(FORCE_TIERED),1) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks $(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 else
--- a/make/solaris/Makefile Fri Nov 05 12:18:30 2010 -0700 +++ b/make/solaris/Makefile Sat Nov 06 02:53:59 2010 -0700 @@ -53,7 +53,9 @@ include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make ifndef CC_INTERP -FORCE_TIERED=1 + ifndef FORCE_TIERED + FORCE_TIERED=1 + endif endif ifdef LP64 @@ -210,7 +212,7 @@ $(BUILDTREE) VARIANT=tiered $(SUBDIRS_C2): $(BUILDTREE_MAKE) -ifdef FORCE_TIERED +ifeq ($(FORCE_TIERED),1) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks $(BUILDTREE) VARIANT=tiered FORCE_TIERED=1 else
--- a/make/windows/build.make Fri Nov 05 12:18:30 2010 -0700 +++ b/make/windows/build.make Sat Nov 06 02:53:59 2010 -0700 @@ -74,9 +74,11 @@ !if "$(BUILDARCH)" != "ia64" !ifndef CC_INTERP +!ifndef FORCE_TIERED FORCE_TIERED=1 !endif !endif +!endif !if "$(BUILDARCH)" == "amd64" Platform_arch=x86 @@ -100,7 +102,7 @@ !if "$(Variant)" == "compiler1" VARIANT_TEXT=Client !elseif "$(Variant)" == "compiler2" -!ifdef FORCE_TIERED +!if "$(FORCE_TIERED)" == "1" VARIANT_TEXT=Server realVariant=tiered !else
--- a/src/share/vm/runtime/java.cpp Fri Nov 05 12:18:30 2010 -0700 +++ b/src/share/vm/runtime/java.cpp Sat Nov 06 02:53:59 2010 -0700 @@ -198,7 +198,7 @@ if (CountCompiledCalls) { print_method_invocation_histogram(); } - if (ProfileInterpreter || C1UpdateMethodData) { + if (ProfileInterpreter COMPILER1_PRESENT(|| C1UpdateMethodData)) { print_method_profiling_data(); } if (TimeCompiler) {