提交 a4f3a135 编写于 作者: S simonis

8146979: Backport of 8046471 breaks ppc64 build in jdk8u because 8072383 was...

8146979: Backport of 8046471 breaks ppc64 build in jdk8u because 8072383 was badly backported before
Reviewed-by: erikj, dholmes
上级 3d67a98a
# #
# 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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
...@@ -285,7 +285,7 @@ ifneq ($(OSNAME),windows) ...@@ -285,7 +285,7 @@ ifneq ($(OSNAME),windows)
# Use uname output for SRCARCH, but deal with platform differences. If ARCH # Use uname output for SRCARCH, but deal with platform differences. If ARCH
# is not explicitly listed below, it is treated as x86. # 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/ = x86
ARCH/sparc = sparc ARCH/sparc = sparc
ARCH/sparc64= sparc ARCH/sparc64= sparc
...@@ -293,6 +293,7 @@ ifneq ($(OSNAME),windows) ...@@ -293,6 +293,7 @@ ifneq ($(OSNAME),windows)
ARCH/amd64 = x86 ARCH/amd64 = x86
ARCH/x86_64 = x86 ARCH/x86_64 = x86
ARCH/ppc64 = ppc ARCH/ppc64 = ppc
ARCH/ppc = ppc
ARCH/zero = zero ARCH/zero = zero
# BUILDARCH is usually the same as SRCARCH, except for sparcv9 # BUILDARCH is usually the same as SRCARCH, except for sparcv9
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册