Date: Tue, 28 Apr 2015 05:40:25 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384884 - in head/java/openjdk7: . files Message-ID: <201504280540.t3S5ePKc048673@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Tue Apr 28 05:40:24 2015 New Revision: 384884 URL: https://svnweb.freebsd.org/changeset/ports/384884 Log: . Update to 7u80. Added: head/java/openjdk7/files/patch-7u80-b32 (contents, props changed) Modified: head/java/openjdk7/Makefile head/java/openjdk7/files/patch-bsd Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Tue Apr 28 05:39:54 2015 (r384883) +++ head/java/openjdk7/Makefile Tue Apr 28 05:40:24 2015 (r384884) @@ -3,7 +3,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ @@ -36,8 +35,8 @@ DEBUG_DESC= Enable extra debugging info POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data -PORT_MINOR_VERSION= 76 -PORT_BUILD_NUMBER= 13 +PORT_MINOR_VERSION= 80 +PORT_BUILD_NUMBER= 15 JDK_MAJOR_VERSION= 7 JDK_MINOR_VERSION= 40 JDK_BUILD_NUMBER= 43 Added: head/java/openjdk7/files/patch-7u80-b32 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-7u80-b32 Tue Apr 28 05:40:24 2015 (r384884) @@ -0,0 +1,109450 @@ +--- ./.hgtags Mon Jan 05 11:48:37 2015 -0800 ++++ ./.hgtags Fri Apr 10 09:18:39 2015 -0700 +@@ -525,6 +525,10 @@ + fa606411d8fd650334b6f90d626399e13e77740f jdk7u72-b14 + f42462b4dfd81539eacf90955d2d26e1dc1686c0 jdk7u72-b30 + 891bb800d7b2abff392669276f9e55ff30ba9962 jdk7u72-b31 ++cc4b22b0bc1810d6bb1367f08c47707923a89b0e jdk7u72-b32 ++9179bba54a0d43be8a5325152acd29ac2852c4d5 jdk7u72-b33 ++8c92ab4f302fea71b378a0eb8912d2321acdae68 jdk7u72-b34 ++8d5af53bb3926fac6aa21e2f02a8df7c6718c5c2 jdk7u72-b35 + 569e053e97b4fecaf1371f7cf2645394edb8a11a jdk7u75-b00 + 618b221a71a962f1d62a5b02db1b4256bad9441a jdk7u75-b01 + eb36016211cb5d412c779836bd8efbf133cbf6f5 jdk7u75-b02 +@@ -556,3 +560,37 @@ + 01d1d34f82f30de97a61f8b0048c61aa17d0dd12 jdk7u76-b12 + a9728fbea214dbf6f58567e729fdc5276f3c704f jdk7u76-b13 + a788e9c5671436bb711f0e185cd74b17220d6e35 jdk7u76-b30 ++ed58c355d118cb3d9713de41ecb105cca3175472 jdk7u76-b31 ++79a5a54289ef52fc67d5447bacc60610282b1e3c jdk7u76-b32 ++dcc07fe8d380a63c22086abeb62a5a9780b3639c jdk7u79-b00 ++9d7b2508882acda9da48a0f52490e1b31111fcd6 jdk7u79-b01 ++fc70c5c1a1c0cfd7fd11237a5a7fcce6a1cd2cd8 jdk7u79-b02 ++6842b297466cf696cca4ac6f776183bd74e8f52f jdk7u79-b03 ++7d851d1726c67146e491575e905aaa3f1eb90083 jdk7u79-b06 ++9e76c64141e8b65d64d0defbe12094d6c9eb8f03 jdk7u79-b07 ++52a09e691b39ab0f23ca0830fbb2a372e157990c jdk7u79-b08 ++5127e5f6909283ade8de12d0a912b82383cd0084 jdk7u79-b09 ++83f6693e12e6265e914ad07b5fe137ab01c2dbbf jdk7u79-b10 ++be4cf73f2c91c252c84fb1799e68585027eab3b0 jdk7u79-b11 ++fae704111ce1257c66c80e1221cf89522fd2d52e jdk7u79-b12 ++434885f8214fd2671ea6b4708663fc9a14505872 jdk7u79-b13 ++4dc3a33c7c9d3a88ee566554ffd8253b777aa6a4 jdk7u79-b14 ++ee3b3ebecd737ff98883e4f15471887dfdfa8dce jdk7u79-b30 ++127bfeeddc9cf2f8cbf58052f32f6c8676fb8840 jdk7u79-b15 ++d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u80-b00 ++90564f0970e92b844122be27f051655aef6dc423 jdk7u80-b01 ++36e8397bf04d972519b80ca9e24e68a2ed1e4dbd jdk7u80-b02 ++4093bbbc90009bfd9311ccd6373c7a2f2755c9d9 jdk7u80-b03 ++928d01695cd2b65119bbfcd51032ae427a66f83d jdk7u80-b04 ++46d516760a680deaeffdb03e3221648bc14c0818 jdk7u80-b05 ++8fffdc2d1faaf2c61abff00ee41f50d28da2174a jdk7u80-b06 ++6d0aaea852b04d7270fde5c289827b00f2391374 jdk7u80-b07 ++e8daab5fb25eb513c53d6d766d50caf662131d79 jdk7u80-b08 ++8c0f70ebdfbd5b06c759ab762b093e8c3ee6558e jdk7u80-b09 ++67dafced5999152f5f88ace0a84122909049182c jdk7u80-b10 ++7a31b13266333dbc62825b827fb5730417d7212c jdk7u80-b11 ++96d3f807999b5c2d8b07ebf0b79fdbc1952d1109 jdk7u80-b12 ++5bd350f497873137786dc6ff5abcae1207bcc30b jdk7u80-b13 ++4da82068f37e17858d318d24a5a6284d48627e68 jdk7u80-b14 ++611f7d38d9346243b558dc78409b813241eb426f jdk7u80-b30 ++f19659de2034611095d307ccc68f777abc8b008e jdk7u80-b15 +--- ./THIRD_PARTY_README Mon Jan 05 11:48:37 2015 -0800 ++++ ./THIRD_PARTY_README Fri Apr 10 09:18:39 2015 -0700 +@@ -1001,7 +1001,7 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to libpng 1.5.4, which is ++%% This notice is provided with respect to libpng 1.6.16, which is + included with JRE 7, JDK 7, and OpenJDK 7. + + --- begin of LICENSE --- +@@ -1017,7 +1017,7 @@ + + This code is released under the libpng license. + +-libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are ++libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are + Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-1.2.5 + with the following individual added to the list of Contributing Authors +@@ -1115,7 +1115,7 @@ + + Glenn Randers-Pehrson + glennrp at users.sourceforge.net +-July 7, 2011 ++December 22, 2014 + + --- end of LICENSE --- + +@@ -1912,35 +1912,6 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to Sparkle v.1.5, +-which is included with JRE 7 on Mac OS X. +- +---- begin of LICENSE --- +- +-Copyright (c) 2012 Sparkle.org and Andy Matuschak +- +-Permission is hereby granted, free of charge, to any person obtaining a copy +-of this software and associated documentation files (the "Software"), to deal +-in the Software without restriction, including without limitation the rights +-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-copies of the Software, and to permit persons to whom the Software is +-furnished to do so, subject to the following conditions: +- +-The above copyright notice and this permission notice shall be included in all +-copies or substantial portions of the Software. +- +-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-SOFTWARE. +- +---- end of LICENSE --- +- +-------------------------------------------------------------------------------- +- + %% Portions licensed from Taligent, Inc. + + ------------------------------------------------------------------------------- +@@ -3198,12 +3169,12 @@ + %% This notice is provided with respect to the following which is + included with JRE 7, JDK 7, and OpenJDK 7, except where noted: + +- Apache Derby 10.8.3.0 [included with JDK 7 only] ++ Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Jakarta BCEL 5.2 + Apache Jakarta Regexp 1.4 + Apache Santuario XMLSec-Java 1.4.2 + Apache Xalan-Java 2.7.1 +- Apache Xerces2 Java 2.11.0 ++ Apache Xerces2 Java 2.10.0 + Apache XML Resolver 1.1 + + +--- ./make/jprt.properties Mon Jan 05 11:48:37 2015 -0800 ++++ ./make/jprt.properties Fri Apr 10 09:18:39 2015 -0700 +@@ -83,6 +83,7 @@ + ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \ ++ ${jprt.my.test.target.set:TESTNAME=jdk_security4}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_management}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \ +--- ./test/Makefile Mon Jan 05 11:48:37 2015 -0800 ++++ ./test/Makefile Fri Apr 10 09:18:39 2015 -0700 +@@ -63,7 +63,7 @@ + jdk_other \ + jdk_net \ + jdk_nio \ +- jdk_security1 jdk_security2 jdk_security3 \ ++ jdk_security1 jdk_security2 jdk_security3 jdk_security4 \ + jdk_sound \ + jdk_text \ + jdk_tools \ +--- ./corba/.hgtags Mon Jan 05 11:49:17 2015 -0800 ++++ ./corba/.hgtags Fri Apr 10 09:18:50 2015 -0700 +@@ -527,6 +527,10 @@ + bd80d0c18ccd97669dd8392dbde5cd91f647ee1d jdk7u72-b14 + 66da7f46eff05df2aa3bb9b5c1f7ee47a75828a5 jdk7u72-b30 + 4fefe5c11ddb650e681e2dd5e8ac8dfeb15e6afd jdk7u72-b31 ++c8d42c36b2ab3db65bcd7497ca87e3b2c191f3f7 jdk7u72-b32 ++a3070ed2ab6aa1542e5e545e9e19684dcd056945 jdk7u72-b33 ++5d1445139b101e045fd389578df8825d5b2d0dad jdk7u72-b34 ++acc110e88fc38ed6118ed1fe44a3211f5b4a6337 jdk7u72-b35 + 88772da384953fed254492c3ea9da498381081f2 jdk7u75-b00 + 0466441d71122c9af252ec17f597f228dbf64578 jdk7u75-b01 + 9aa7fe309fa584ff782ab9d557632321747ba11e jdk7u75-b02 +@@ -558,3 +562,37 @@ + 14f0846f4d1b8373e3e3cce10901f37341bf6980 jdk7u76-b12 + 0db41b697138ce89f15c49eef1dc670f94a27d89 jdk7u76-b13 + 71a8665159f2f014b1869f3d723d3b6fbe878a16 jdk7u76-b30 ++7a566e2b22722a59174c7cced744bdda3709ce2e jdk7u76-b31 ++dbbdf5e8b66e6fccd36977016d38683346c5d107 jdk7u76-b32 ++f55967c261230a4fcc8d71ecfe58f2f47ea50393 jdk7u79-b00 ++d2a032b5389366fdff24b8a5ba52931da14d2a8d jdk7u79-b01 ++0a8522745129e647c3b1fe9ef7b5f7d84e063938 jdk7u79-b02 ++df1f9eb105ed2b05c0d15b08abded72e8e4a76c5 jdk7u79-b03 ++f2c5c65d2d7f2153370429ebc8dfded9f9ada43e jdk7u79-b06 ++3f5ddba1c4f1f5268d2419360c9b83f303166f4f jdk7u79-b07 ++65366f746473f25f9ccda87e5c77f04247050a86 jdk7u79-b08 ++58c0e28636cd1b3e947e71a40693f57f65a48ba4 jdk7u79-b09 ++b36cf254eef39119d817eef3344b98c5a79c30b8 jdk7u79-b10 ++0ebb0413e7d9f8352bdb92552f5fc1056049c9dd jdk7u79-b11 ++2ae2ecbcdd17641b8eb4d97fa2324ef41a2fddb7 jdk7u79-b12 ++ec5c1e656d0383c697c7a3a7f3c6839d225ea649 jdk7u79-b13 ++4262b390c9460e6dbeb6968a60ac6356452d47a9 jdk7u79-b14 ++89b8b9610d476843e696cdad5d8d238f83e00c94 jdk7u79-b30 ++59faa52493939dccdf6ff9efe86371101769b8f9 jdk7u79-b15 ++1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u80-b00 ++df1decc820934ad8bf91c853e81c88d4f7590e25 jdk7u80-b01 ++2444fa7df7e3e07f2533f6c875c3a8e408048f6c jdk7u80-b02 ++fc6a39d6be24e0c1f7d9193e4f3ea4e474bb4dc3 jdk7u80-b03 ++d9ddd2aec6bee31e3bd8bb4eb258c27a624162c3 jdk7u80-b04 ++6696348644df30f1807acd3a38a603ebdf09480c jdk7u80-b05 ++4362d8c11c43fb414a75b03616252cf8007eea61 jdk7u80-b06 ++1191862bb140612cc458492a0ffac5969f48c4df jdk7u80-b07 ++6a12979724faeb9abe3e6af347c64f173713e8a4 jdk7u80-b08 ++f09d8e79d1e970a583677987f2baa2a030903441 jdk7u80-b09 ++d4abe9013712af965bc7284efaa7f8d3cc90dde8 jdk7u80-b10 ++7c5957c3d8d6d5c2e9562267bf2db68dec775fb1 jdk7u80-b11 ++fa884531a1a32d78fb6b4e5253dae275eaaddd2c jdk7u80-b12 ++8e4a2983e0d085331c7281d90f23c43bfdab5ed4 jdk7u80-b13 ++90e140a093262c0ca0b408a5997074fbd87639c0 jdk7u80-b14 ++52b7bbe24e490090f98bee27dbd5ec5715b31243 jdk7u80-b30 ++353be4a0a6ec19350d18e0e9ded5544ed5d7433f jdk7u80-b15 +--- ./corba/THIRD_PARTY_README Mon Jan 05 11:49:17 2015 -0800 ++++ ./corba/THIRD_PARTY_README Fri Apr 10 09:18:50 2015 -0700 +@@ -1001,7 +1001,7 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to libpng 1.5.4, which is ++%% This notice is provided with respect to libpng 1.6.16, which is + included with JRE 7, JDK 7, and OpenJDK 7. + + --- begin of LICENSE --- +@@ -1017,7 +1017,7 @@ + + This code is released under the libpng license. + +-libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are ++libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are + Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-1.2.5 + with the following individual added to the list of Contributing Authors +@@ -1115,7 +1115,7 @@ + + Glenn Randers-Pehrson + glennrp at users.sourceforge.net +-July 7, 2011 ++December 22, 2014 + + --- end of LICENSE --- + +@@ -1912,35 +1912,6 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to Sparkle v.1.5, +-which is included with JRE 7 on Mac OS X. +- +---- begin of LICENSE --- +- +-Copyright (c) 2012 Sparkle.org and Andy Matuschak +- +-Permission is hereby granted, free of charge, to any person obtaining a copy +-of this software and associated documentation files (the "Software"), to deal +-in the Software without restriction, including without limitation the rights +-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-copies of the Software, and to permit persons to whom the Software is +-furnished to do so, subject to the following conditions: +- +-The above copyright notice and this permission notice shall be included in all +-copies or substantial portions of the Software. +- +-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-SOFTWARE. +- +---- end of LICENSE --- +- +-------------------------------------------------------------------------------- +- + %% Portions licensed from Taligent, Inc. + + ------------------------------------------------------------------------------- +@@ -3198,12 +3169,12 @@ + %% This notice is provided with respect to the following which is + included with JRE 7, JDK 7, and OpenJDK 7, except where noted: + +- Apache Derby 10.8.3.0 [included with JDK 7 only] ++ Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Jakarta BCEL 5.2 + Apache Jakarta Regexp 1.4 + Apache Santuario XMLSec-Java 1.4.2 + Apache Xalan-Java 2.7.1 +- Apache Xerces2 Java 2.11.0 ++ Apache Xerces2 Java 2.10.0 + Apache XML Resolver 1.1 + + +--- ./hotspot/.hgtags Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/.hgtags Fri Apr 10 09:19:25 2015 -0700 +@@ -752,6 +752,10 @@ + d9b56c6bdddb6f9d8242230f5fdd58f9c7d30ea5 jdk7u72-b14 + a6ae698522bfab3c595a4f8c2c3ee7e8939eb1bb jdk7u72-b30 + 492a2abed4ca015459e24f7348233531b7e929d2 jdk7u72-b31 ++61dacdb82145abe6cb5911e5a06fd8d8622fb55f jdk7u72-b32 ++64cbcac4027843d0292f262520a8945161cc1657 jdk7u72-b33 ++bcb9613e07e212f3103a3bcc5e5085b4d69ad5e1 jdk7u72-b34 ++f9c89a617dac063054749d1880807f6700f04c8a jdk7u72-b35 + e6b6d91b3934c281086f8efacb0926e7451cc18b jdk7u75-b00 + 9096ac248b379a0f3012f18c7289ec47cdef8459 jdk7u75-b01 + a6964b2822d906eab9c923cdd723cf3dd4facfcd jdk7u75-b02 +@@ -783,3 +787,44 @@ + e375023d196199ffb263cb15739f7218e1621be6 jdk7u76-b12 + a395c29532e5322657c542d54dd957940cf2f523 jdk7u76-b13 + 98f0c5279ba76eb1b5741dc67f7b5f10e7508449 jdk7u76-b30 ++875d0ccc97fe7a46a0a9996e897827022db58200 jdk7u76-b31 ++dfc50bbce42cff3d17d4d8780646dedac8d3dad0 jdk7u76-b32 ++2480d9d778301a3f88b0ab8ee35a585df82528e5 jdk7u79-b00 ++ae6723b35de91e3e964cc92d832e17743e4f43c6 jdk7u79-b01 ++653c92d16c45392cd7a5073528c8b8396c1f087c jdk7u79-b02 ++e6d47ed41881381a212faf9e394011cf10d76509 jdk7u79-b03 ++c5486f8bb2dbc5ab176235adc999d31ad5f413fb jdk7u79-b06 ++5439057a4c7fd26de2fe129eb5d695dda7f42dcf jdk7u79-b07 ++e65e02cf3523bf5c5ea4df6d17a7b60b456c53b5 jdk7u79-b08 ++641e2adae9d455ef8a41b319e86c4ed8148735b9 jdk7u79-b09 ++e5512513c35ccd3f3552039b0cf6352cce0af9f2 jdk7u79-b10 ++5cef060f38caed08ea20a08d40735a5395d3f73e jdk7u79-b11 ++8f34a2992faa8a2592fc15a5309340635a423fd5 jdk7u79-b12 ++08c8504cd6ce900078d2187ca8f0545328872cba jdk7u79-b13 ++30e5853fcd717f6284b916b2c8fe388408e055f0 jdk7u79-b14 ++4d4936bc95f47c3b6591b163ae06e4952ef66344 jdk7u79-b30 ++78dcbf58e349beaafeed97f7e897832d28a3403f jdk7u79-b15 ++b92f390febd01615af4a736b4f830f6052aa1d09 hs24.80-b00 ++1448ebfef4f1aae0174eca983ad05507730ca6fd hs24.80-b01 ++b1d29549dca7e36a4d050af5a54f8f56963a5c7d hs24.80-b02 ++ff18bcebe2943527cdbc094375c38c27ec7f2442 hs24.80-b03 ++1b9722b5134a8e565d8b8fe851849e034beff057 hs24.80-b04 ++04d6919c44db8c9d811ef0ac4775a579f854cdfc hs24.80-b05 ++ee18e60e7e8da9f1912895af353564de0330a2b1 hs24.80-b06 ++05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u80-b00 ++e2533d62ca887078e4b952a75a75680cfb7894b9 jdk7u80-b01 ++bad107a5d096b070355c5a2d80aa50bc5576144b jdk7u80-b02 ++9d2b485d2a58ea57ab2b3c06b2128f456ab39a38 jdk7u80-b03 ++a89267b51c40cba0b26fe84831478389723c8321 jdk7u80-b04 ++00402b4ff7a90a6deba09816192e335cadfdb4f0 jdk7u80-b05 ++87d4354a3ce8aafccf1f1cd9cb9d88a58731dde8 jdk7u80-b06 ++d496bd71dc129828c2b5962e2072cdb591454e4a jdk7u80-b07 ++5ce33a4444cf74e04c22fb11b1e1b76b68a6477a jdk7u80-b08 ++48af02f3c56ceefc4a1b16a4bdb6d54e416b2171 jdk7u80-b09 ++502c24b2ffaed2e2a209c7d84bb53a98c062e5ef jdk7u80-b10 ++c59862e92fb3f919da426efa01b4c699ce122517 jdk7u80-b11 ++a0572b740d79d089de854e498f57a55c9a59c9ad jdk7u80-b12 ++a550ec1c311fe9c3393597cae620b02fa9e1dfa1 jdk7u80-b13 ++c63aa8d5e8ab6e86df1f5d54bcf7a54ec325667c jdk7u80-b14 ++27e0103f3b11f06bc3277914564ed9a1976fb3d5 jdk7u80-b30 ++426e09df7eda980317d1308af15c29ef691cd471 jdk7u80-b15 +--- ./hotspot/THIRD_PARTY_README Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/THIRD_PARTY_README Fri Apr 10 09:19:25 2015 -0700 +@@ -1001,7 +1001,7 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to libpng 1.5.4, which is ++%% This notice is provided with respect to libpng 1.6.16, which is + included with JRE 7, JDK 7, and OpenJDK 7. + + --- begin of LICENSE --- +@@ -1017,7 +1017,7 @@ + + This code is released under the libpng license. + +-libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are ++libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are + Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-1.2.5 + with the following individual added to the list of Contributing Authors +@@ -1115,7 +1115,7 @@ + + Glenn Randers-Pehrson + glennrp at users.sourceforge.net +-July 7, 2011 ++December 22, 2014 + + --- end of LICENSE --- + +@@ -1912,35 +1912,6 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to Sparkle v.1.5, +-which is included with JRE 7 on Mac OS X. +- +---- begin of LICENSE --- +- +-Copyright (c) 2012 Sparkle.org and Andy Matuschak +- +-Permission is hereby granted, free of charge, to any person obtaining a copy +-of this software and associated documentation files (the "Software"), to deal +-in the Software without restriction, including without limitation the rights +-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-copies of the Software, and to permit persons to whom the Software is +-furnished to do so, subject to the following conditions: +- +-The above copyright notice and this permission notice shall be included in all +-copies or substantial portions of the Software. +- +-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-SOFTWARE. +- +---- end of LICENSE --- +- +-------------------------------------------------------------------------------- +- + %% Portions licensed from Taligent, Inc. + + ------------------------------------------------------------------------------- +@@ -3198,12 +3169,12 @@ + %% This notice is provided with respect to the following which is + included with JRE 7, JDK 7, and OpenJDK 7, except where noted: + +- Apache Derby 10.8.3.0 [included with JDK 7 only] ++ Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Jakarta BCEL 5.2 + Apache Jakarta Regexp 1.4 + Apache Santuario XMLSec-Java 1.4.2 + Apache Xalan-Java 2.7.1 +- Apache Xerces2 Java 2.11.0 ++ Apache Xerces2 Java 2.10.0 + Apache XML Resolver 1.1 + + +--- ./hotspot/make/hotspot_version Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/make/hotspot_version Fri Apr 10 09:19:25 2015 -0700 +@@ -34,8 +34,8 @@ + HOTSPOT_VM_COPYRIGHT=Copyright 2015 + + HS_MAJOR_VER=24 +-HS_MINOR_VER=76 +-HS_BUILD_NUMBER=04 ++HS_MINOR_VER=80 ++HS_BUILD_NUMBER=11 + + JDK_MAJOR_VER=1 + JDK_MINOR_VER=7 +--- ./hotspot/make/jprt.properties Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/make/jprt.properties Fri Apr 10 09:19:25 2015 -0700 +@@ -38,7 +38,7 @@ + + # This tells jprt what default release we want to build + +-jprt.hotspot.default.release=jdk7u60 ++jprt.hotspot.default.release=jdk7u72 + + jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}} + +@@ -54,92 +54,94 @@ + # Define the Solaris platforms we want for the various releases + jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10 + jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10 +-jprt.my.solaris.sparc.jdk7u60=${jprt.my.solaris.sparc.jdk7} ++jprt.my.solaris.sparc.jdk7u72=${jprt.my.solaris.sparc.jdk7} + jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}} + + jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10 + jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10 +-jprt.my.solaris.sparcv9.jdk7u60=${jprt.my.solaris.sparcv9.jdk7} ++jprt.my.solaris.sparcv9.jdk7u72=${jprt.my.solaris.sparcv9.jdk7} + jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}} + + jprt.my.solaris.i586.jdk8=solaris_i586_5.10 + jprt.my.solaris.i586.jdk7=solaris_i586_5.10 +-jprt.my.solaris.i586.jdk7u60=${jprt.my.solaris.i586.jdk7} ++jprt.my.solaris.i586.jdk7u72=${jprt.my.solaris.i586.jdk7} + jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}} + + jprt.my.solaris.x64.jdk8=solaris_x64_5.10 + jprt.my.solaris.x64.jdk7=solaris_x64_5.10 +-jprt.my.solaris.x64.jdk7u60=${jprt.my.solaris.x64.jdk7} ++jprt.my.solaris.x64.jdk7u72=${jprt.my.solaris.x64.jdk7} + jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} + + jprt.my.linux.i586.jdk8=linux_i586_2.6 + jprt.my.linux.i586.jdk7=linux_i586_2.6 +-jprt.my.linux.i586.jdk7u60=${jprt.my.linux.i586.jdk7} ++jprt.my.linux.i586.jdk7u72=${jprt.my.linux.i586.jdk7} + jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}} + + jprt.my.linux.x64.jdk8=linux_x64_2.6 + jprt.my.linux.x64.jdk7=linux_x64_2.6 +-jprt.my.linux.x64.jdk7u60=${jprt.my.linux.x64.jdk7} ++jprt.my.linux.x64.jdk7u72=${jprt.my.linux.x64.jdk7} + jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}} + + jprt.my.linux.ppc.jdk8=linux_ppc_2.6 + jprt.my.linux.ppc.jdk7=linux_ppc_2.6 +-jprt.my.linux.ppc.jdk7u60=${jprt.my.linux.ppc.jdk7} ++jprt.my.linux.ppc.jdk7u72=${jprt.my.linux.ppc.jdk7} + jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}} + + jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6 + jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6 +-jprt.my.linux.ppcv2.jdk7u60=${jprt.my.linux.ppcv2.jdk7} ++jprt.my.linux.ppcv2.jdk7u72=${jprt.my.linux.ppcv2.jdk7} + jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}} + + jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6 + jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6 +-jprt.my.linux.armvfp.jdk7u60=${jprt.my.linux.armvfp.jdk7} ++jprt.my.linux.armvfp.jdk7u72=${jprt.my.linux.armvfp.jdk7} + jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}} + + jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6 + jprt.my.linux.armvfpsflt.jdk7=linux_armvfpsflt_2.6 +-jprt.my.linux.armvfpsflt.jdk7u60=${jprt.my.linux.armvfpsflt.jdk7} ++jprt.my.linux.armvfpsflt.jdk7u72=${jprt.my.linux.armvfpsflt.jdk7} + jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}} + + jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6 + jprt.my.linux.armvfphflt.jdk7=linux_armvfphflt_2.6 +-jprt.my.linux.armvfphflt.jdk7u60=${jprt.my.linux.armvfphflt.jdk7} ++jprt.my.linux.armvfphflt.jdk7u72=${jprt.my.linux.armvfphflt.jdk7} + jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}} + + jprt.my.linux.armv6.jdk8=linux_armv6_2.6 + jprt.my.linux.armv6.jdk7=linux_armv6_2.6 +-jprt.my.linux.armv6.jdk7u60=${jprt.my.linux.armv6.jdk7} ++jprt.my.linux.armv6.jdk7u72=${jprt.my.linux.armv6.jdk7} + jprt.my.linux.armv6=${jprt.my.linux.armv6.${jprt.tools.default.release}} + + jprt.my.linux.armvs.jdk8=linux_armvs_2.6 + jprt.my.linux.armvs.jdk7=linux_armvs_2.6 +-jprt.my.linux.armvs.jdk7u60=${jprt.my.linux.armvs.jdk7} ++jprt.my.linux.armvs.jdk7u72=${jprt.my.linux.armvs.jdk7} + jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}} + + jprt.my.linux.armvh.jdk8=linux_armvh_2.6 + jprt.my.linux.armvh.jdk7=linux_armvh_2.6 +-jprt.my.linux.armvh.jdk7u60=${jprt.my.linux.armvh.jdk7} ++jprt.my.linux.armvh.jdk7u72=${jprt.my.linux.armvh.jdk7} + jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}} + + jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6 + jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 +-jprt.my.linux.armsflt.jdk7u60=${jprt.my.linux.armsflt.jdk7} ++jprt.my.linux.armsflt.jdk7u72=${jprt.my.linux.armsflt.jdk7} + jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} + ++jprt.my.linux.sparcv9=linux_sparcv9_3.8 ++ + jprt.my.macosx.x64.jdk8=macosx_x64_10.7 + jprt.my.macosx.x64.jdk7=macosx_x64_10.7 +-jprt.my.macosx.x64.jdk7u60=${jprt.my.macosx.x64.jdk7} ++jprt.my.macosx.x64.jdk7u72=${jprt.my.macosx.x64.jdk7} + jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}} + + jprt.my.windows.i586.jdk8=windows_i586_5.1 + jprt.my.windows.i586.jdk7=windows_i586_5.1 +-jprt.my.windows.i586.jdk7u60=${jprt.my.windows.i586.jdk7} ++jprt.my.windows.i586.jdk7u72=${jprt.my.windows.i586.jdk7} + jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} + + jprt.my.windows.x64.jdk8=windows_x64_5.2 + jprt.my.windows.x64.jdk7=windows_x64_5.2 +-jprt.my.windows.x64.jdk7u60=${jprt.my.windows.x64.jdk7} ++jprt.my.windows.x64.jdk7u72=${jprt.my.windows.x64.jdk7} + jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}} + + # Standard list of jprt build targets for this source tree +@@ -151,6 +153,7 @@ + ${jprt.my.solaris.x64}-{product|fastdebug|debug}, \ + ${jprt.my.linux.i586}-{product|fastdebug|debug}, \ + ${jprt.my.linux.x64}-{product|fastdebug}, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}, \ + ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \ + ${jprt.my.windows.i586}-{product|fastdebug|debug}, \ + ${jprt.my.windows.x64}-{product|fastdebug|debug}, \ +@@ -177,7 +180,7 @@ + + jprt.build.targets.jdk8=${jprt.build.targets.all} + jprt.build.targets.jdk7=${jprt.build.targets.all} +-jprt.build.targets.jdk7u60=${jprt.build.targets.all} ++jprt.build.targets.jdk7u72=${jprt.build.targets.all} + jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}} + + # Subset lists of test targets for this source tree +@@ -352,6 +355,30 @@ + ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_G1, \ + ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParOldGC + ++jprt.my.linux.sparcv9.test.targets = \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jvm98, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jvm98_nontiered, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-scimark, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_default, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_SerialGC, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_ParallelGC, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_ParNewGC, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_CMS, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_G1, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCBasher_ParOldGC, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_default, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_SerialGC, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_ParallelGC, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_ParNewGC, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_CMS, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_G1, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-GCOld_ParOldGC, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_default, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_default_nontiered, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_ParallelGC, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_G1, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-jbb_ParOldGC ++ + jprt.my.macosx.x64.test.targets = \ + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98, \ + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98_nontiered, \ +@@ -452,6 +479,7 @@ + ${jprt.my.solaris.x64.test.targets}, \ + ${jprt.my.linux.i586.test.targets}, \ + ${jprt.my.linux.x64.test.targets}, \ ++ ${jprt.my.linux.sparcv9.test.targets}, \ + ${jprt.my.macosx.x64.test.targets}, \ + ${jprt.my.windows.i586.test.targets}, \ + ${jprt.my.windows.x64.test.targets}, \ +@@ -470,7 +498,7 @@ + + jprt.test.targets.jdk8=${jprt.test.targets.standard} + jprt.test.targets.jdk7=${jprt.test.targets.standard} +-jprt.test.targets.jdk7u60=${jprt.test.targets.jdk7} ++jprt.test.targets.jdk7u72=${jprt.test.targets.jdk7} + jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}} + + # The default test/Makefile targets that should be run +@@ -490,6 +518,7 @@ + ${jprt.my.solaris.x64}-*-c2-servertest, \ + ${jprt.my.linux.i586}-*-c2-servertest, \ + ${jprt.my.linux.x64}-*-c2-servertest, \ ++ ${jprt.my.linux.sparcv9}-*-c2-servertest, \ + ${jprt.my.macosx.x64}-*-c2-servertest, \ + ${jprt.my.windows.i586}-*-c2-servertest, \ + ${jprt.my.windows.x64}-*-c2-servertest +@@ -501,6 +530,7 @@ + ${jprt.my.solaris.x64}-fastdebug-c2-internalvmtests, \ + ${jprt.my.linux.i586}-fastdebug-c2-internalvmtests, \ + ${jprt.my.linux.x64}-fastdebug-c2-internalvmtests, \ ++ ${jprt.my.linux.sparcv9}-fastdebug-c2-internalvmtests, \ + ${jprt.my.macosx.x64}-fastdebug-c2-internalvmtests, \ + ${jprt.my.windows.i586}-fastdebug-c2-internalvmtests, \ + ${jprt.my.windows.x64}-fastdebug-c2-internalvmtests +@@ -512,6 +542,7 @@ + ${jprt.my.solaris.x64}-{product|fastdebug}-c2-wbapitest, \ + ${jprt.my.linux.i586}-{product|fastdebug}-c2-wbapitest, \ + ${jprt.my.linux.x64}-{product|fastdebug}-c2-wbapitest, \ ++ ${jprt.my.linux.sparcv9}-{product|fastdebug}-c2-wbapitest, \ + ${jprt.my.windows.i586}-{product|fastdebug}-c2-wbapitest, \ + ${jprt.my.windows.x64}-{product|fastdebug}-c2-wbapitest, \ + ${jprt.my.solaris.sparc}-{product|fastdebug}-c1-wbapitest, \ +@@ -530,7 +561,7 @@ + + jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard} + jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard} +-jprt.make.rule.test.targets.jdk7u60=${jprt.make.rule.test.targets.jdk7} ++jprt.make.rule.test.targets.jdk7u72=${jprt.make.rule.test.targets.jdk7} + jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}} + + # 7155453: Work-around to prevent popups on OSX from blocking test completion +--- ./hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Apr 10 09:19:25 2015 -0700 +@@ -119,7 +119,15 @@ + inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d) { emit_long( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | rs2(s2) ); } + inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec) { emit_data( op(ldst_op) | fd(d, w) | alt_op3(ldf_op3, w) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); } + +-inline void Assembler::ldf(FloatRegisterImpl::Width w, const Address& a, FloatRegister d, int offset) { relocate(a.rspec(offset)); ldf( w, a.base(), a.disp() + offset, d); } ++inline void Assembler::ldf(FloatRegisterImpl::Width w, const Address& a, FloatRegister d, int offset) { ++ relocate(a.rspec(offset)); ++ if (a.has_index()) { ++ assert(offset == 0, ""); ++ ldf(w, a.base(), a.index(), d); ++ } else { ++ ldf(w, a.base(), a.disp() + offset, d); ++ } ++} + + inline void Assembler::ldfsr( Register s1, Register s2) { v9_dep(); emit_long( op(ldst_op) | op3(ldfsr_op3) | rs1(s1) | rs2(s2) ); } + inline void Assembler::ldfsr( Register s1, int simm13a) { v9_dep(); emit_data( op(ldst_op) | op3(ldfsr_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); } +--- ./hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp Fri Apr 10 09:19:25 2015 -0700 +@@ -614,8 +614,8 @@ + // Save the regs and make space for a C call + __ save(SP, -96, SP); + __ save_all_globals_into_locals(); +- BLOCK_COMMENT("call os::naked_sleep"); +- __ call(CAST_FROM_FN_PTR(address, os::naked_sleep)); ++ BLOCK_COMMENT("call os::naked_short_sleep"); ++ __ call(CAST_FROM_FN_PTR(address, os::naked_short_sleep)); + __ delayed()->nop(); + __ restore_globals_from_locals(); + __ restore(); +--- ./hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp Fri Apr 10 09:19:25 2015 -0700 +@@ -98,6 +98,27 @@ + _supports_cx8 = has_v9(); + _supports_atomic_getset4 = true; // swap instruction + ++ // There are Fujitsu Sparc64 CPUs which support blk_init as well so ++ // we have to take this check out of the 'is_niagara()' block below. ++ if (has_blk_init()) { ++ // When using CMS or G1, we cannot use memset() in BOT updates ++ // because the sun4v/CMT version in libc_psr uses BIS which ++ // exposes "phantom zeros" to concurrent readers. See 6948537. ++ if (FLAG_IS_DEFAULT(UseMemSetInBOT) && (UseConcMarkSweepGC || UseG1GC)) { ++ FLAG_SET_DEFAULT(UseMemSetInBOT, false); ++ } ++ // Issue a stern warning if the user has explicitly set ++ // UseMemSetInBOT (it is known to cause issues), but allow ++ // use for experimentation and debugging. ++ if (UseConcMarkSweepGC || UseG1GC) { ++ if (UseMemSetInBOT) { ++ assert(!FLAG_IS_DEFAULT(UseMemSetInBOT), "Error"); ++ warning("Experimental flag -XX:+UseMemSetInBOT is known to cause instability" ++ " on sun4v; please understand that you are using at your own risk!"); ++ } ++ } ++ } ++ + if (is_niagara()) { + // Indirect branch is the same cost as direct + if (FLAG_IS_DEFAULT(UseInlineCaches)) { +@@ -107,12 +128,6 @@ + if (FLAG_IS_DEFAULT(OptoLoopAlignment)) { + FLAG_SET_DEFAULT(OptoLoopAlignment, 4); + } +- // When using CMS or G1, we cannot use memset() in BOT updates +- // because the sun4v/CMT version in libc_psr uses BIS which +- // exposes "phantom zeros" to concurrent readers. See 6948537. +- if (FLAG_IS_DEFAULT(UseMemSetInBOT) && (UseConcMarkSweepGC || UseG1GC)) { +- FLAG_SET_DEFAULT(UseMemSetInBOT, false); +- } + #ifdef _LP64 + // 32-bit oops don't make sense for the 64-bit VM on sparc + // since the 32-bit VM has the same registers and smaller objects. +--- ./hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp Fri Apr 10 09:19:25 2015 -0700 +@@ -96,7 +96,13 @@ + static bool is_M_family(int features) { return (features & M_family_m) != 0; } + static bool is_T_family(int features) { return (features & T_family_m) != 0; } + static bool is_niagara() { return is_T_family(_features); } +- DEBUG_ONLY( static bool is_niagara(int features) { return (features & sun4v_m) != 0; } ) ++#ifdef ASSERT ++ static bool is_niagara(int features) { ++ // 'sun4v_m' may be defined on both Sun/Oracle Sparc CPUs as well as ++ // on Fujitsu Sparc64 CPUs, but only Sun/Oracle Sparcs can be 'niagaras'. ++ return (features & sun4v_m) != 0 && (features & sparc64_family_m) == 0; ++ } ++#endif + + // Returns true if it is niagara1 (T1). + static bool is_T1_model(int features) { return is_T_family(features) && ((features & T1_model_m) != 0); } +--- ./hotspot/src/cpu/x86/vm/assembler_x86.cpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/cpu/x86/vm/assembler_x86.cpp Fri Apr 10 09:19:25 2015 -0700 +@@ -7641,10 +7641,12 @@ + // if fast computation is not possible, result is NaN. Requires + // fallback from user of this macro. + // increase precision for intermediate steps of the computation ++ BLOCK_COMMENT("fast_pow {"); + increase_precision(); + fyl2x(); // Stack: (Y*log2(X)) ... + pow_exp_core_encoding(); // Stack: exp(X) ... + restore_precision(); ++ BLOCK_COMMENT("} fast_pow"); + } + + void MacroAssembler::fast_exp() { +--- ./hotspot/src/cpu/x86/vm/frame_x86.inline.hpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/cpu/x86/vm/frame_x86.inline.hpp Fri Apr 10 09:19:25 2015 -0700 +@@ -292,14 +292,18 @@ + return true; + } + ++inline oop frame::saved_oop_result(RegisterMap* map) const { ++ oop* result_adr = (oop *)map->location(rax->as_VMReg()); ++ guarantee(result_adr != NULL, "bad register save location"); + +- +-inline oop frame::saved_oop_result(RegisterMap* map) const { +- return *((oop*) map->location(rax->as_VMReg())); ++ return (*result_adr); + } + + inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) { +- *((oop*) map->location(rax->as_VMReg())) = obj; ++ oop* result_adr = (oop *)map->location(rax->as_VMReg()); ++ guarantee(result_adr != NULL, "bad register save location"); ++ ++ *result_adr = obj; + } + + #endif // CPU_X86_VM_FRAME_X86_INLINE_HPP +--- ./hotspot/src/cpu/x86/vm/vm_version_x86.hpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/cpu/x86/vm/vm_version_x86.hpp Fri Apr 10 09:19:25 2015 -0700 +@@ -499,10 +499,12 @@ + static uint cores_per_cpu() { + uint result = 1; + if (is_intel()) { +- if (supports_processor_topology()) { ++ bool supports_topology = supports_processor_topology(); ++ if (supports_topology) { + result = _cpuid_info.tpl_cpuidB1_ebx.bits.logical_cpus / + _cpuid_info.tpl_cpuidB0_ebx.bits.logical_cpus; +- } else { ++ } ++ if (!supports_topology || result == 0) { + result = (_cpuid_info.dcp_cpuid4_eax.bits.cores_per_cpu + 1); + } + } else if (is_amd()) { +--- ./hotspot/src/os/bsd/dtrace/libjvm_db.c Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/os/bsd/dtrace/libjvm_db.c Fri Apr 10 09:19:25 2015 -0700 +@@ -261,6 +261,9 @@ + uint64_t base; + int err; + ++ /* Clear *vmp now in case we jump to fail: */ ++ memset(vmp, 0, sizeof(VMStructEntry)); ++ + err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr); + CHECK_FAIL(err); + err = read_pointer(J, sym_addr, &gHotSpotVMStructs); +--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Fri Apr 10 09:19:25 2015 -0700 +@@ -3711,9 +3711,21 @@ + } + } + +-int os::naked_sleep() { +- // %% make the sleep time an integer flag. for now use 1 millisec. +- return os::sleep(Thread::current(), 1, false); ++void os::naked_short_sleep(jlong ms) { ++ struct timespec req; ++ ++ assert(ms < 1000, "Un-interruptable sleep, short time use only"); ++ req.tv_sec = 0; ++ if (ms > 0) { ++ req.tv_nsec = (ms % 1000) * 1000000; ++ } ++ else { ++ req.tv_nsec = 1; ++ } ++ ++ nanosleep(&req, NULL); ++ ++ return; + } + + // Sleep forever; naked call to OS-specific sleep; use with CAUTION +--- ./hotspot/src/os/linux/vm/os_linux.cpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/os/linux/vm/os_linux.cpp Fri Apr 10 09:19:25 2015 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -3866,9 +3866,33 @@ + } + } + +-int os::naked_sleep() { +- // %% make the sleep time an integer flag. for now use 1 millisec. +- return os::sleep(Thread::current(), 1, false); ++// ++// Short sleep, direct OS call. ++// ++// Note: certain versions of Linux CFS scheduler (since 2.6.23) do not guarantee ++// sched_yield(2) will actually give up the CPU: ++// ++// * Alone on this pariticular CPU, keeps running. ++// * Before the introduction of "skip_buddy" with "compat_yield" disabled ++// (pre 2.6.39). ++// ++// So calling this with 0 is an alternative. ++// ++void os::naked_short_sleep(jlong ms) { ++ struct timespec req; ++ ++ assert(ms < 1000, "Un-interruptable sleep, short time use only"); ++ req.tv_sec = 0; ++ if (ms > 0) { ++ req.tv_nsec = (ms % 1000) * 1000000; ++ } ++ else { ++ req.tv_nsec = 1; ++ } ++ ++ nanosleep(&req, NULL); ++ ++ return; + } + + // Sleep forever; naked call to OS-specific sleep; use with CAUTION +@@ -6041,26 +6065,57 @@ + #define __NR_execve IA32_ONLY(11) IA64_ONLY(1033) AMD64_ONLY(59) + #endif + ++#if defined(SPARC) ++// This assembly code makes the call to "syscall(__NR_fork)" and then ++// gets the values for "pid" and "is_child" from the correct registers. ++// This was done to make sure the compiler does not change the order ++// of the instructions while optimizing. ++void sparc_fork(int nr_fork, pid_t *pid, int *ischild) { ++ asm volatile ( ++ " mov %2, %%o0\n\t" ++ " call syscall, 0\n\t" ++ " nop\n\t" ++ " mov %%o0, %0\n\t" ++ " mov %%o1, %1\n\t" ++ : "=r" (*pid), "=r" (*ischild) ++ : "r" (nr_fork) : ++ ); ++} ++#endif ++ + // Run the specified command in a separate process. Return its exit value, + // or -1 on failure (e.g. can't fork a new process). + // Unlike system(), this function can be called from signal handler. It + // doesn't block SIGINT et al. + int os::fork_and_exec(char* cmd) { + const char * argv[4] = {"sh", "-c", cmd, NULL}; ++ int is_child; ++ pid_t pid; + + // fork() in LinuxThreads/NPTL is not async-safe. It needs to run + // pthread_atfork handlers and reset pthread library. All we need is a + // separate process to execve. Make a direct syscall to fork process. + // On IA64 there's no fork syscall, we have to use fork() and hope for + // the best... +- pid_t pid = NOT_IA64(syscall(__NR_fork);) ++#if defined(SPARC) ++ sparc_fork(__NR_fork, &pid, &is_child); ++#else ++ pid = NOT_IA64(syscall(__NR_fork);) + IA64_ONLY(fork();) + ++ // set the is_child flag by checking the pid ++ if (pid == 0) { ++ is_child = 1; ++ } else { ++ is_child = 0; ++ } ++#endif ++ + if (pid < 0) { + // fork failed + return -1; + +- } else if (pid == 0) { ++ } else if (is_child) { + // child process + + // execve() in LinuxThreads will call pthread_kill_other_threads_np() +--- ./hotspot/src/os/solaris/dtrace/libjvm_db.c Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/os/solaris/dtrace/libjvm_db.c Fri Apr 10 09:19:25 2015 -0700 +@@ -261,6 +261,9 @@ + uint64_t base; + int err; + ++ /* Clear *vmp now in case we jump to fail: */ ++ memset(vmp, 0, sizeof(VMStructEntry)); ++ + err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr); + CHECK_FAIL(err); + err = read_pointer(J, sym_addr, &gHotSpotVMStructs); +--- ./hotspot/src/os/solaris/vm/os_solaris.cpp Mon Jan 05 11:51:17 2015 -0800 ++++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Fri Apr 10 09:19:25 2015 -0700 +@@ -2311,8 +2311,8 @@ + st->cr(); + status = true; + } +- ::close(fd); + } ++ ::close(fd); + } + return status; + } +@@ -2336,13 +2336,18 @@ + "ILL_ILLTRP", "ILL_PRVOPC", "ILL_PRVREG", *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504280540.t3S5ePKc048673>