# HG changeset patch # User simonis # Date 1452736037 18000 # Node ID c649dde410414c38de4f1499e042a29f0aa72b98 # Parent b40d68340febdb9e03ce6abeff7534fb222e94fc 8146979: Backport of 8046471 breaks ppc64 build in jdk8u because 8072383 was badly backported before Reviewed-by: erikj, dholmes diff -r b40d68340feb -r c649dde41041 make/defs.make --- a/make/defs.make Fri Jan 08 05:28:21 2016 -0800 +++ b/make/defs.make Wed Jan 13 20:47:17 2016 -0500 @@ -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 @@ # 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 @@ 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