8048232: Fix for 8046471 breaks PPC64 build

Reviewed-by: dcubed, mikael

make/linux/Makefile

@@ -67,8 +67,12 @@ ifndef CC_INTERP
   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

make/linux/makefiles/defs.make

@@ -99,7 +99,9 @@ ifneq (,$(findstring $(ARCH), amd64 x86_64 i686 i586))
 endif
 
 # PPC
-ifneq (,$(findstring $(ARCH), ppc))
+# 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)
     MAKE_ARGS        += LP64=1
     PLATFORM         = linux-ppc64