changeset 7886:bd33e3fce750

8048232: Fix for 8046471 breaks PPC64 build Reviewed-by: dcubed, mikael
author gthornbr
date Fri, 18 Dec 2015 10:11:58 -0800
parents 5d96c022391c
children 48eec0ba6526
files make/linux/Makefile make/linux/makefiles/defs.make
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/linux/Makefile	Thu Dec 17 17:18:59 2015 -0800
+++ b/make/linux/Makefile	Fri Dec 18 10:11:58 2015 -0800
@@ -67,8 +67,12 @@
   endif
 endif
 # C1 is not ported on ppc64, so we cannot build a tiered VM:
-ifeq ($(ARCH),ppc64)
-  FORCE_TIERED=0
+# 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
--- a/make/linux/makefiles/defs.make	Thu Dec 17 17:18:59 2015 -0800
+++ b/make/linux/makefiles/defs.make	Fri Dec 18 10:11:58 2015 -0800
@@ -99,7 +99,9 @@
 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