8079410: Hotspot version to share the same update and build version from JDK
Reviewed-by: dholmes, dcubed
diff --git a/hotspot/make/defs.make b/hotspot/make/defs.make
index c70b3db..25c0b16 100644
--- a/hotspot/make/defs.make
+++ b/hotspot/make/defs.make
@@ -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 --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index f64747c..b0b82b8 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -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
