diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index aec4d9868440cc279791a3e85187983c0f3ae7f4..4c646e81bed2597ec09310b68287c2c288e7f865 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 1f06f0ce7d520c35ce628cf96df25c27081a4a69..20096b365439c14c1e69b914ed16d84f93b1c2ec 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 ;;