Updating for Java 8u40

diff --git a/gradle.properties b/gradle.properties
index c002ebc0077f60c4052769449299c450468eb26d..170c38655372b46fb09516b691353e57c7c7787b 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,8 @@ targetJre=build/jre
 #hotspotTag=jdk8u20-b22
 #hotspotTag=jdk8u5-b13
 #hotspotTag=jdk8u31-b13
-hotspotTag=jdk8u40-b25
+#hotspotTag=jdk8u40-b25
+hotspotTag=jdk8u45-b14
 #hotspotTag=jdk7u71-b01
 #hotspotTag=jdk7u60-b09
 #hotspotTag=jdk7u55-b13

diff --git a/hotspot/.hg/patches/series b/hotspot/.hg/patches/series
index 7d08dd06460946352e524cea0ce446fccfc7281d..8aa0a003b162f56f821eb7af9b26d83af3739e8e 100644 (file)
--- a/hotspot/.hg/patches/series
+++ b/hotspot/.hg/patches/series
@@ -4,15 +4,15 @@ distro-name.patch
 # Add AllowEnhancedRedefinition argument
 arguments-java8.patch #+light-jdk8u5-b13 #+light-jdk8u20-b22
 arguments-java8u31.patch #+light-jdk8u31-b13
-arguments-java8u40.patch #+light-jdk8u40-b25
+arguments-java8u40.patch #+light-jdk8u40-b25 #+light-jdk8u45-b14
 
 # GC changes to allow modifying instances during redefinition run
 gc-java8.patch #+light-jdk8u5-b13 #+light-jdk8u20-b22 #+light-jdk8u31-b13
-gc-java8u40.patch #+light-jdk8u40-b25
+gc-java8u40.patch #+light-jdk8u40-b25 #+light-jdk8u45-b14
 
 # Add support for certain DMH implementations
 dmh-field-accessors-java8.patch #+light-jdk8u5-b13 #+light-jdk8u20-b22 #+light-jdk8u31-b13
-dmh-field-accessors-java8u40.patch #+light-jdk8u40-b25
+dmh-field-accessors-java8u40.patch #+light-jdk8u40-b25 #+light-jdk8u45-b14
 
 # Rest of the changes
 full-jdk7u11-b21.patch  #+full-jdk7u11-b21
@@ -36,6 +36,6 @@ full-jdk7u60-deopt-cp.patch #+full-jdk7u60-b09 #+full-jdk7u71-b01
 light-jdk8u5-b13.patch  #+light-jdk8u5-b13
 
 light-jdk8u20-b22.patch  #+light-jdk8u20-b22 #+light-jdk8u31-b13
-light-jdk8u40-b25.patch #+light-jdk8u40-b25
-light-jdk8u20-deopt-cp.patch #+light-jdk8u20-b22 #+light-jdk8u31-b13 #+light-jdk8u40-b25
+light-jdk8u40-b25.patch #+light-jdk8u40-b25 #+light-jdk8u45-b14
+light-jdk8u20-deopt-cp.patch #+light-jdk8u20-b22 #+light-jdk8u31-b13 #+light-jdk8u40-b25 #+light-jdk8u45-b14