From a4f3a135913ca566199450d02e51cdf0bfb30e92 Mon Sep 17 00:00:00 2001 From: simonis Date: Wed, 13 Jan 2016 20:47:17 -0500 Subject: [PATCH] 8146979: Backport of 8046471 breaks ppc64 build in jdk8u because 8072383 was badly backported before Reviewed-by: erikj, dholmes --- make/defs.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/defs.make b/make/defs.make index 25c0b168e..b5a41239c 100644 --- a/make/defs.make +++ b/make/defs.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -285,7 +285,7 @@ ifneq ($(OSNAME),windows) # Use uname output for SRCARCH, but deal with platform differences. If ARCH # is not explicitly listed below, it is treated as x86. - SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc64 zero,$(ARCH))) + SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64 zero,$(ARCH))) ARCH/ = x86 ARCH/sparc = sparc ARCH/sparc64= sparc @@ -293,6 +293,7 @@ ifneq ($(OSNAME),windows) ARCH/amd64 = x86 ARCH/x86_64 = x86 ARCH/ppc64 = ppc + ARCH/ppc = ppc ARCH/zero = zero # BUILDARCH is usually the same as SRCARCH, except for sparcv9 -- GitLab