From 590d5b5837c6e4ffa3ba0bed6b80f2a37bf095f7 Mon Sep 17 00:00:00 2001 From: sgehwolf Date: Tue, 3 Mar 2015 11:51:15 +0100 Subject: [PATCH] 8067330: ZERO_ARCHDEF incorrectly defined for PPC/PPC64 architectures Reviewed-by: simonis, tbell, erikj --- common/autoconf/generated-configure.sh | 5 +++-- common/autoconf/platform.m4 | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index aec4d98..4c646e8 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3877,7 +3877,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1421450260 +DATE_WHEN_GENERATED=1425379745 ############################################################################### # @@ -7212,7 +7212,8 @@ $as_echo "$COMPILE_TYPE" >&6; } # ZERO_ARCHDEF is used to enable architecture-specific code case "${OPENJDK_TARGET_CPU}" in - ppc*) ZERO_ARCHDEF=PPC ;; + ppc) ZERO_ARCHDEF=PPC32 ;; + ppc64) ZERO_ARCHDEF=PPC64 ;; s390*) ZERO_ARCHDEF=S390 ;; sparc*) ZERO_ARCHDEF=SPARC ;; x86_64*) ZERO_ARCHDEF=AMD64 ;; diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 index 1f06f0c..20096b3 100644 --- a/common/autoconf/platform.m4 +++ b/common/autoconf/platform.m4 @@ -365,7 +365,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS], # ZERO_ARCHDEF is used to enable architecture-specific code case "${OPENJDK_TARGET_CPU}" in - ppc*) ZERO_ARCHDEF=PPC ;; + ppc) ZERO_ARCHDEF=PPC32 ;; + ppc64) ZERO_ARCHDEF=PPC64 ;; s390*) ZERO_ARCHDEF=S390 ;; sparc*) ZERO_ARCHDEF=SPARC ;; x86_64*) ZERO_ARCHDEF=AMD64 ;; -- GitLab