# HG changeset patch # User duke # Date 1499276669 -7200 # Node ID 45796bb2a654cc7ad73e10bff953cd88b9132f4f # Parent 6ff236765d3b96a5cbc1b072bcac019056d561dd# Parent ef0b81bf865961efa9dcb3d99a4c3c1d6f5b59ff Merge diff -r 6ff236765d3b -r 45796bb2a654 .hgtags-top-repo --- a/.hgtags-top-repo Thu Jun 12 10:32:44 2014 -0700 +++ b/.hgtags-top-repo Wed Jul 05 19:44:29 2017 +0200 @@ -259,3 +259,4 @@ 4e3aa9723e9972623e3dafc321b368e7db7e9b3b jdk9-b14 b114474fb25af4e73cb7219f7c04bd8994da03a5 jdk9-b15 cf22a728521f91a4692b433d39d730a0a1b23155 jdk9-b16 +24152ee0ee1abef54a8bab04c099261dba7bcca5 jdk9-b17 diff -r 6ff236765d3b -r 45796bb2a654 corba/.hgtags --- a/corba/.hgtags Thu Jun 12 10:32:44 2014 -0700 +++ b/corba/.hgtags Wed Jul 05 19:44:29 2017 +0200 @@ -259,3 +259,4 @@ a2b82f863ba95a596da555a4c1b871c404863e7e jdk9-b14 e54022d0dd92106fff7f7fe670010cd7e6517ee3 jdk9-b15 422ef9d29d84f571453f015c4cb8713c3af70ee4 jdk9-b16 +4c75c2ca7cf3e0618315879acf17f42c8fcd0c09 jdk9-b17 diff -r 6ff236765d3b -r 45796bb2a654 hotspot/.hgtags --- a/hotspot/.hgtags Thu Jun 12 10:32:44 2014 -0700 +++ b/hotspot/.hgtags Wed Jul 05 19:44:29 2017 +0200 @@ -419,3 +419,4 @@ bd333491bb6c012d7b606939406d0fa9a5ac7ffd jdk9-b14 170f6d733d7aec062f743a6b8c1cce940a7a984a jdk9-b15 b14e7c0b7d3ec04127f565cda1d84122e205680c jdk9-b16 +14b656df31c2cb09c505921061e79977823de71a jdk9-b17 diff -r 6ff236765d3b -r 45796bb2a654 hotspot/make/jprt.properties --- a/hotspot/make/jprt.properties Thu Jun 12 10:32:44 2014 -0700 +++ b/hotspot/make/jprt.properties Wed Jul 05 19:44:29 2017 +0200 @@ -47,10 +47,10 @@ # sparc etc. # Define the Solaris platforms we want for the various releases -jprt.my.solaris.sparcv9.jdk9=solaris_sparcv9_5.10 +jprt.my.solaris.sparcv9.jdk9=solaris_sparcv9_5.11 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}} -jprt.my.solaris.x64.jdk9=solaris_x64_5.10 +jprt.my.solaris.x64.jdk9=solaris_x64_5.11 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} jprt.my.linux.i586.jdk9=linux_i586_2.6 diff -r 6ff236765d3b -r 45796bb2a654 jdk/.hgtags --- a/jdk/.hgtags Thu Jun 12 10:32:44 2014 -0700 +++ b/jdk/.hgtags Wed Jul 05 19:44:29 2017 +0200 @@ -259,3 +259,4 @@ 5c7a17a81afd0906b53ee31d95a3211c96ff6b25 jdk9-b14 4537360f09fe23ab339ee588747b657feb12d0c8 jdk9-b15 ab7d2c565b0de5bee1361d282d4029371327fc9e jdk9-b16 +fd8e675f141b9bdb2f46d1ae8251f4ee3a895d64 jdk9-b17 diff -r 6ff236765d3b -r 45796bb2a654 make/jprt.properties --- a/make/jprt.properties Thu Jun 12 10:32:44 2014 -0700 +++ b/make/jprt.properties Wed Jul 05 19:44:29 2017 +0200 @@ -25,7 +25,7 @@ # Properties for jprt -# Locked down to jdk8 +# Locked down to jdk9 jprt.tools.default.release=jdk9 # Unix toolkit to use for building on windows @@ -36,8 +36,8 @@ # Standard list of jprt build targets for this source tree jprt.build.targets= \ - solaris_sparcv9_5.10-{product|fastdebug}, \ - solaris_x64_5.10-{product|fastdebug}, \ + solaris_sparcv9_5.11-{product|fastdebug}, \ + solaris_x64_5.11-{product|fastdebug}, \ linux_i586_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \ macosx_x64_10.7-{product|fastdebug}, \ @@ -49,8 +49,8 @@ # Test target list (no fastdebug & limited c2 testing) jprt.my.test.target.set= \ - solaris_sparcv9_5.10-product-c2-TESTNAME, \ - solaris_x64_5.10-product-c2-TESTNAME, \ + solaris_sparcv9_5.11-product-c2-TESTNAME, \ + solaris_x64_5.11-product-c2-TESTNAME, \ linux_i586_2.6-product-{c1|c2}-TESTNAME, \ linux_x64_2.6-product-c2-TESTNAME, \ macosx_x64_10.7-product-c2-TESTNAME, \ @@ -131,8 +131,8 @@ # JCK test targets in test/Makefile (no windows) jprt.my.jck.test.target.set= \ - solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \ - solaris_x64_5.10-product-c2-JCK7TESTRULE, \ + solaris_sparcv9_5.11-product-c2-JCK7TESTRULE, \ + solaris_x64_5.11-product-c2-JCK7TESTRULE, \ linux_i586_2.6-product-c1-JCK7TESTRULE, \ linux_x64_2.6-product-c2-JCK7TESTRULE