Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
Merge
Mon, 21 Oct 2013 17:26:46 -0700
- author
- ccheung
- date
- Mon, 21 Oct 2013 17:26:46 -0700
- changeset 5969
- 1327b7f85503
- parent 5968
- 996d1f2f056f
- parent 5953
- 384c92148c68
- child 5970
- 662c154d2749
- child 5971
- b8860472c377
- child 5973
- a997d762fa20
Merge
1.1 --- a/.hgtags Sat Oct 19 21:29:57 2013 +0400 1.2 +++ b/.hgtags Mon Oct 21 17:26:46 2013 -0700 1.3 @@ -385,3 +385,5 @@ 1.4 562a3d356de67670b4172b82aca2d30743449e04 hs25-b53 1.5 f6962730bbde82f279a0ae3a1c14bc5e58096c6e jdk8-b111 1.6 4a845c7a463844cead9e1e1641d6bcfb8a77f1c7 hs25-b54 1.7 +0ed9a90f45e1b392c671005f9ee22ce1acf02984 jdk8-b112 1.8 +23b8db5ea31d3079f1326afde4cd5c67b1dac49c hs25-b55
2.1 --- a/make/hotspot_version Sat Oct 19 21:29:57 2013 +0400 2.2 +++ b/make/hotspot_version Mon Oct 21 17:26:46 2013 -0700 2.3 @@ -35,7 +35,7 @@ 2.4 2.5 HS_MAJOR_VER=25 2.6 HS_MINOR_VER=0 2.7 -HS_BUILD_NUMBER=55 2.8 +HS_BUILD_NUMBER=56 2.9 2.10 JDK_MAJOR_VER=1 2.11 JDK_MINOR_VER=8
3.1 --- a/make/jprt.properties Sat Oct 19 21:29:57 2013 +0400 3.2 +++ b/make/jprt.properties Mon Oct 21 17:26:46 2013 -0700 3.3 @@ -24,12 +24,7 @@ 3.4 3.5 # Properties for jprt 3.6 3.7 -# All build result bundles are full jdks, so the 64bit testing does not 3.8 -# need the 32bit sibling bundle installed. 3.9 -# Note: If the hotspot/make/Makefile changed to only bundle the 64bit files 3.10 -# when bundling 64bit, and stripped out the 64bit files from any 32bit 3.11 -# bundles, then this setting would be need to be "true". 3.12 - 3.13 +# All build result bundles are full jdks. 3.14 jprt.need.sibling.build=false 3.15 3.16 # At submit time, the release supplied will be in jprt.submit.release 3.17 @@ -52,21 +47,11 @@ 3.18 # sparc etc. 3.19 3.20 # Define the Solaris platforms we want for the various releases 3.21 -jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10 3.22 -jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10 3.23 -jprt.my.solaris.sparc.jdk7u8=${jprt.my.solaris.sparc.jdk7} 3.24 -jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}} 3.25 - 3.26 jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10 3.27 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10 3.28 jprt.my.solaris.sparcv9.jdk7u8=${jprt.my.solaris.sparcv9.jdk7} 3.29 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}} 3.30 3.31 -jprt.my.solaris.i586.jdk8=solaris_i586_5.10 3.32 -jprt.my.solaris.i586.jdk7=solaris_i586_5.10 3.33 -jprt.my.solaris.i586.jdk7u8=${jprt.my.solaris.i586.jdk7} 3.34 -jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}} 3.35 - 3.36 jprt.my.solaris.x64.jdk8=solaris_x64_5.10 3.37 jprt.my.solaris.x64.jdk7=solaris_x64_5.10 3.38 jprt.my.solaris.x64.jdk7u8=${jprt.my.solaris.x64.jdk7} 3.39 @@ -133,9 +118,7 @@ 3.40 # Standard list of jprt build targets for this source tree 3.41 3.42 jprt.build.targets.standard= \ 3.43 - ${jprt.my.solaris.sparc}-{product|fastdebug}, \ 3.44 ${jprt.my.solaris.sparcv9}-{product|fastdebug|optimized}, \ 3.45 - ${jprt.my.solaris.i586}-{product|fastdebug}, \ 3.46 ${jprt.my.solaris.x64}-{product|fastdebug}, \ 3.47 ${jprt.my.linux.i586}-{product|fastdebug}, \ 3.48 ${jprt.my.linux.x64}-{product|fastdebug|optimized}, \ 3.49 @@ -145,7 +128,6 @@ 3.50 ${jprt.my.linux.armvh}-{product|fastdebug} 3.51 3.52 jprt.build.targets.open= \ 3.53 - ${jprt.my.solaris.i586}-{productOpen}, \ 3.54 ${jprt.my.solaris.x64}-{debugOpen}, \ 3.55 ${jprt.my.linux.x64}-{productOpen} 3.56 3.57 @@ -168,31 +150,6 @@ 3.58 3.59 # Subset lists of test targets for this source tree 3.60 3.61 -jprt.my.solaris.sparc.test.targets= \ 3.62 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jvm98, \ 3.63 - ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jvm98_nontiered, \ 3.64 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark, \ 3.65 - ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese, \ 3.66 - ${jprt.my.solaris.sparc}-fastdebug-c1-runThese_Xshare, \ 3.67 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ 3.68 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ 3.69 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ 3.70 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ 3.71 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ 3.72 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ 3.73 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_SerialGC, \ 3.74 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParallelGC, \ 3.75 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParNewGC, \ 3.76 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_CMS, \ 3.77 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_G1, \ 3.78 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParOldGC, \ 3.79 - ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jbb_default_nontiered, \ 3.80 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_SerialGC, \ 3.81 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_ParallelGC, \ 3.82 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_CMS, \ 3.83 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_G1, \ 3.84 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_ParOldGC 3.85 - 3.86 jprt.my.solaris.sparcv9.test.targets= \ 3.87 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98, \ 3.88 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98_nontiered, \ 3.89 @@ -242,37 +199,6 @@ 3.90 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_G1, \ 3.91 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParOldGC 3.92 3.93 -jprt.my.solaris.i586.test.targets= \ 3.94 - ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ 3.95 - ${jprt.my.solaris.i586}-{product|fastdebug}-c2-jvm98_nontiered, \ 3.96 - ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark, \ 3.97 - ${jprt.my.solaris.i586}-product-{c1|c2}-runThese_Xcomp, \ 3.98 - ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xcomp, \ 3.99 - ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xshare, \ 3.100 - ${jprt.my.solaris.i586}-product-c1-GCBasher_SerialGC, \ 3.101 - ${jprt.my.solaris.i586}-product-c1-GCBasher_ParallelGC, \ 3.102 - ${jprt.my.solaris.i586}-product-c1-GCBasher_ParNewGC, \ 3.103 - ${jprt.my.solaris.i586}-product-c1-GCBasher_CMS, \ 3.104 - ${jprt.my.solaris.i586}-product-c1-GCBasher_G1, \ 3.105 - ${jprt.my.solaris.i586}-product-c1-GCBasher_ParOldGC, \ 3.106 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_SerialGC, \ 3.107 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParallelGC, \ 3.108 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParNewGC, \ 3.109 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_CMS, \ 3.110 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_G1, \ 3.111 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParOldGC, \ 3.112 - ${jprt.my.solaris.i586}-product-c1-GCOld_SerialGC, \ 3.113 - ${jprt.my.solaris.i586}-product-c1-GCOld_ParallelGC, \ 3.114 - ${jprt.my.solaris.i586}-product-c1-GCOld_ParNewGC, \ 3.115 - ${jprt.my.solaris.i586}-product-c1-GCOld_CMS, \ 3.116 - ${jprt.my.solaris.i586}-product-c1-GCOld_G1, \ 3.117 - ${jprt.my.solaris.i586}-product-c1-GCOld_ParOldGC, \ 3.118 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default_nontiered, \ 3.119 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParallelGC, \ 3.120 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_CMS, \ 3.121 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_G1, \ 3.122 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParOldGC 3.123 - 3.124 jprt.my.linux.i586.test.targets = \ 3.125 ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ 3.126 ${jprt.my.linux.i586}-{product|fastdebug}-c2-jvm98_nontiered, \ 3.127 @@ -395,7 +321,6 @@ 3.128 # Some basic "smoke" tests for OpenJDK builds 3.129 jprt.test.targets.open = \ 3.130 ${jprt.my.solaris.x64}-{productOpen|fastdebugOpen}-c2-jvm98, \ 3.131 - ${jprt.my.solaris.i586}-{productOpen|fastdebugOpen}-c2-jvm98, \ 3.132 ${jprt.my.linux.x64}-{productOpen|fastdebugOpen}-c2-jvm98 3.133 3.134 # Testing for actual embedded builds is different to standard 3.135 @@ -407,9 +332,7 @@ 3.136 3.137 jprt.test.targets.standard = \ 3.138 ${jprt.my.linux.i586.test.targets.embedded}, \ 3.139 - ${jprt.my.solaris.sparc.test.targets}, \ 3.140 ${jprt.my.solaris.sparcv9.test.targets}, \ 3.141 - ${jprt.my.solaris.i586.test.targets}, \ 3.142 ${jprt.my.solaris.x64.test.targets}, \ 3.143 ${jprt.my.linux.i586.test.targets}, \ 3.144 ${jprt.my.linux.x64.test.targets}, \ 3.145 @@ -420,15 +343,12 @@ 3.146 3.147 jprt.test.targets.embedded= \ 3.148 ${jprt.my.linux.i586.test.targets.embedded}, \ 3.149 - ${jprt.my.solaris.sparc.test.targets}, \ 3.150 ${jprt.my.solaris.sparcv9.test.targets}, \ 3.151 - ${jprt.my.solaris.i586.test.targets}, \ 3.152 ${jprt.my.solaris.x64.test.targets}, \ 3.153 ${jprt.my.linux.x64.test.targets}, \ 3.154 ${jprt.my.windows.i586.test.targets}, \ 3.155 ${jprt.my.windows.x64.test.targets} 3.156 3.157 - 3.158 jprt.test.targets.jdk8=${jprt.test.targets.standard} 3.159 jprt.test.targets.jdk7=${jprt.test.targets.standard} 3.160 jprt.test.targets.jdk7u8=${jprt.test.targets.jdk7} 3.161 @@ -439,15 +359,11 @@ 3.162 #jprt.make.rule.test.targets=*-product-*-packtest 3.163 3.164 jprt.make.rule.test.targets.standard.client = \ 3.165 - ${jprt.my.solaris.sparc}-*-c1-clienttest, \ 3.166 - ${jprt.my.solaris.i586}-*-c1-clienttest, \ 3.167 ${jprt.my.linux.i586}-*-c1-clienttest, \ 3.168 ${jprt.my.windows.i586}-*-c1-clienttest 3.169 3.170 jprt.make.rule.test.targets.standard.server = \ 3.171 - ${jprt.my.solaris.sparc}-*-c2-servertest, \ 3.172 ${jprt.my.solaris.sparcv9}-*-c2-servertest, \ 3.173 - ${jprt.my.solaris.i586}-*-c2-servertest, \ 3.174 ${jprt.my.solaris.x64}-*-c2-servertest, \ 3.175 ${jprt.my.linux.i586}-*-c2-servertest, \ 3.176 ${jprt.my.linux.x64}-*-c2-servertest, \ 3.177 @@ -456,9 +372,7 @@ 3.178 ${jprt.my.windows.x64}-*-c2-servertest 3.179 3.180 jprt.make.rule.test.targets.standard.internalvmtests = \ 3.181 - ${jprt.my.solaris.sparc}-fastdebug-c2-internalvmtests, \ 3.182 ${jprt.my.solaris.sparcv9}-fastdebug-c2-internalvmtests, \ 3.183 - ${jprt.my.solaris.i586}-fastdebug-c2-internalvmtests, \ 3.184 ${jprt.my.solaris.x64}-fastdebug-c2-internalvmtests, \ 3.185 ${jprt.my.linux.i586}-fastdebug-c2-internalvmtests, \ 3.186 ${jprt.my.linux.x64}-fastdebug-c2-internalvmtests, \ 3.187 @@ -467,16 +381,12 @@ 3.188 ${jprt.my.windows.x64}-fastdebug-c2-internalvmtests 3.189 3.190 jprt.make.rule.test.targets.standard.wbapi = \ 3.191 - ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-wbapitest, \ 3.192 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-wbapitest, \ 3.193 - ${jprt.my.solaris.i586}-{product|fastdebug}-c2-wbapitest, \ 3.194 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-wbapitest, \ 3.195 ${jprt.my.linux.i586}-{product|fastdebug}-c2-wbapitest, \ 3.196 ${jprt.my.linux.x64}-{product|fastdebug}-c2-wbapitest, \ 3.197 ${jprt.my.windows.i586}-{product|fastdebug}-c2-wbapitest, \ 3.198 ${jprt.my.windows.x64}-{product|fastdebug}-c2-wbapitest, \ 3.199 - ${jprt.my.solaris.sparc}-{product|fastdebug}-c1-wbapitest, \ 3.200 - ${jprt.my.solaris.i586}-{product|fastdebug}-c1-wbapitest, \ 3.201 ${jprt.my.linux.i586}-{product|fastdebug}-c1-wbapitest, \ 3.202 ${jprt.my.windows.i586}-{product|fastdebug}-c1-wbapitest 3.203
