Merge

.hgtags

@@ -401,3 +401,6 @@ acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01
 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02
 590cc3ca1fec083de3543b18b0062651b597e376 jdk8u60-b03
 d8d408861c2094c24e9757a67bf2941ed37ce01f jdk8u60-b04
+e532f3672f635bd83c673c349b7563db6dd470bb jdk8u60-b05
+74dbdbcb6aac9fd62f3599ad4e0a1f930b1e9ac1 jdk8u60-b06
+ea714a39e902fb8729f71f2d0f634855646e297d jdk8u60-b07

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 ;;

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 ;;

make/jprt.properties

@@ -29,7 +29,7 @@
 #
 
 # The current release name
-my.jdk.update.version=40
+my.jdk.update.version=60
 jprt.tools.default.release=jdk8u${my.jdk.update.version}
 
 # Check if this is the equivalent of a hotspot push job