make/linux/Makefile

rev 6626 : 8048232: Fix for 8046471 breaks PPC64 build
Reviewed-by: mikael

@@ -65,12 +65,16 @@
   ifndef FORCE_TIERED
     FORCE_TIERED=1
   endif
 endif
 # C1 is not ported on ppc64, so we cannot build a tiered VM:
-ifeq ($(ARCH),ppc64)
+# Notice: after 8046471 ARCH will be 'ppc' for top-level ppc64 builds but
+# 'ppc64' for HotSpot-only ppc64 builds. Need to detect both variants here!
+ifneq (,$(findstring $(ARCH), ppc ppc64))
+  ifeq ($(ARCH_DATA_MODEL), 64)
   FORCE_TIERED=0
+  endif
 endif
 
 ifdef LP64
   ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
     _JUNK_ := $(shell echo >&2 \