# HG changeset patch
# User amurillo
# Date 1437518112 25200
# Node ID 47110b037994f9006c22abcb12569fcafad84edb
# Parent  366edb34d01b4e62321cf19bb5319d247d8dfefc
8079410: Hotspot version to share the same update and build version from JDK
Reviewed-by: dholmes, dcubed

diff -r 366edb34d01b -r 47110b037994 make/defs.make
--- a/make/defs.make	Fri Jul 17 01:04:08 2015 -0700
+++ b/make/defs.make	Tue Jul 21 15:35:12 2015 -0700
@@ -116,6 +116,18 @@
 # hotspot version definitions
 include $(GAMMADIR)/make/hotspot_version
 
+# When config parameter --with-update-version is defined,
+# Hotspot minor version should be set to that
+ifneq ($(JDK_UPDATE_VERSION),)
+  HS_MINOR_VER=$(JDK_UPDATE_VERSION)
+endif
+
+# When config parameter --with-build-number is defined,
+# Hotspot build number should be set to that
+ifneq ($(JDK_BUILD_NUMBER),)
+  HS_BUILD_NUMBER=$(subst b,,$(JDK_BUILD_NUMBER))
+endif
+
 # Java versions needed
 ifeq ($(PREVIOUS_JDK_VERSION),)
   PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION)
diff -r 366edb34d01b -r 47110b037994 make/hotspot_version
--- a/make/hotspot_version	Fri Jul 17 01:04:08 2015 -0700
+++ b/make/hotspot_version	Tue Jul 21 15:35:12 2015 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=66
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=00
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8