diff --git a/make/linux/Makefile b/make/linux/Makefile
index 3187fb914b80cfda3df34bb721f99186fea0c83a..93d83ea2f817308d80bc1737e743067230c4461e 100644
--- a/make/linux/Makefile
+++ b/make/linux/Makefile
@@ -62,7 +62,9 @@ endif
 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 @@ $(SUBDIRS_TIERED): $(BUILDTREE_MAKE)
 	$(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
diff --git a/make/solaris/Makefile b/make/solaris/Makefile
index 622ddd1f884fa622c2bc06c47419e27bc94fee8d..d4bcb90f57a9632442ce1476769f7747ef8d1594 100644
--- a/make/solaris/Makefile
+++ b/make/solaris/Makefile
@@ -53,7 +53,9 @@ endif
 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 @@ $(SUBDIRS_TIERED): $(BUILDTREE_MAKE)
 	$(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
diff --git a/make/windows/build.make b/make/windows/build.make
index 1c502ca1eb31247f8ccde1a924e2a788def76544..8e50a4f077f5b34e58ad4340edebb95f333d7578 100644
--- a/make/windows/build.make
+++ b/make/windows/build.make
@@ -74,9 +74,11 @@ BUILDARCH=ia64
 
 !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 @@ VARIANT_TEXT=Core
 !if "$(Variant)" == "compiler1"
 VARIANT_TEXT=Client
 !elseif "$(Variant)" == "compiler2"
-!ifdef FORCE_TIERED
+!if "$(FORCE_TIERED)" == "1"
 VARIANT_TEXT=Server
 realVariant=tiered
 !else
diff --git a/src/share/vm/runtime/java.cpp b/src/share/vm/runtime/java.cpp
index 726c96be94eef35ff17b69f12e9e3fbc93bb11dd..df135ea973df91566d87130a65d86c644e47a950 100644
--- a/src/share/vm/runtime/java.cpp
+++ b/src/share/vm/runtime/java.cpp
@@ -198,7 +198,7 @@ void print_statistics() {
   if (CountCompiledCalls) {
     print_method_invocation_histogram();
   }
-  if (ProfileInterpreter || C1UpdateMethodData) {
+  if (ProfileInterpreter COMPILER1_PRESENT(|| C1UpdateMethodData)) {
     print_method_profiling_data();
   }
   if (TimeCompiler) {