Merge

.hgtags

@@ -440,3 +440,4 @@ ba0772198525025803b0fddd6a628fc2416b3b85 jdk8u60-b12
 ec24cc303a2cfeb10ff0a5fb7b3d49ef47bb66f7 jdk8u60-b17
 d1d9eb953fbbe1f63a6badb0742508ae5f0d3ab5 jdk8u60-b18
 ff2ddaa4ea3292e2f0931a9a0c3feb33288d7d7f jdk8u60-b19
+c641f979dff0d28dcdc4f303e9d93dda3079a456 jdk8u60-b20

common/autoconf/generated-configure.sh

@@ -800,6 +800,7 @@ BOOT_RTJAR
 JAVA_CHECK
 JAVAC_CHECK
 COOKED_BUILD_NUMBER
+COOKED_JDK_UPDATE_VERSION
 JDK_VERSION
 COPYRIGHT_YEAR
 MACOSX_BUNDLE_ID_BASE
@@ -3878,7 +3879,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1430836833
+DATE_WHEN_GENERATED=1433258489
 
 ###############################################################################
 #
@@ -11294,6 +11295,12 @@ fi
   fi
 
 
+# The cooked update version used to encode trailing letters in the update
+  # version into a trailing number. That is no longer needed, but need to
+  # keep the format in 8u for compatibility.
+  COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0"
+
+
   COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
 
 
@@ -24194,10 +24201,10 @@ fi
       -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
       -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
       -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
-      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
+      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
       -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
       -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
-      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
+      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\""
 
   # lib.exe is used to create static libraries.
   # Extract the first word of "lib", so it can be a program name with args.

common/autoconf/jdk-options.m4

@@ -531,6 +531,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
   fi
   AC_SUBST(JDK_VERSION)
 
+  # The cooked update version used to encode trailing letters in the update
+  # version into a trailing number. That is no longer needed, but need to
+  # keep the format in 8u for compatibility.
+  COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0"
+  AC_SUBST(COOKED_JDK_UPDATE_VERSION)
+
   COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
   AC_SUBST(COOKED_BUILD_NUMBER)
 ])

common/autoconf/spec.gmk.in

@@ -167,6 +167,7 @@ USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@
 # Different version strings generated from the above information.
 JDK_VERSION:=@JDK_VERSION@
 RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
+COOKED_JDK_UPDATE_VERSION:=@COOKED_JDK_UPDATE_VERSION@
 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
 # These variables need to be generated here so that MILESTONE and
 # JDK_BUILD_NUMBER can be overridden on the make command line.

common/autoconf/toolchain.m4

@@ -492,10 +492,10 @@ AC_DEFUN([TOOLCHAIN_SETUP_PATHS],
       -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
       -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
       -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
-      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
+      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
       -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
       -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
-      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
+      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\""
 
   # lib.exe is used to create static libraries.
   AC_CHECK_PROG([WINAR], [lib],[lib],,,)