diff options
| author | gthornbr <none@none> | 2015-12-18 10:11:58 -0800 |
|---|---|---|
| committer | gthornbr <none@none> | 2015-12-18 10:11:58 -0800 |
| commit | c59d607b01cc0e0620d13cde1a715eb81b3eb638 (patch) | |
| tree | ef47be5cc83b58c37b976238a9b846695596244a /make | |
| parent | 956d43099b431d579a89a000805127b1c2d48317 (diff) | |
| download | jdk8u_hotspot-c59d607b01cc0e0620d13cde1a715eb81b3eb638.tar.gz | |
8048232: Fix for 8046471 breaks PPC64 build
Reviewed-by: dcubed, mikael
Diffstat (limited to 'make')
| -rw-r--r-- | make/linux/Makefile | 8 | ||||
| -rw-r--r-- | make/linux/makefiles/defs.make | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/make/linux/Makefile b/make/linux/Makefile index 720eb9018..17c140979 100644 --- a/make/linux/Makefile +++ b/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) - 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 diff --git a/make/linux/makefiles/defs.make b/make/linux/makefiles/defs.make index b1c3057b2..3af5878aa 100644 --- a/make/linux/makefiles/defs.make +++ b/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 |