OpenJDK / jdk / jdk
changeset 9922:e17c699f0a64
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 17:47:03 +0200 |
| parents | af62a2ace951 90bc70682193 |
| children | a2a589fc2954 |
| files | |
| diffstat | 10 files changed, 170 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Wed Jun 22 12:41:28 2011 -0700 +++ b/.hgtags-top-repo Wed Jul 05 17:47:03 2017 +0200 @@ -120,3 +120,4 @@ 14b8e7eee1058fd4ed5a2700a2ce14b3616278f1 jdk7-b143 7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144 55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145 +2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
--- a/THIRD_PARTY_README Wed Jun 22 12:41:28 2011 -0700 +++ b/THIRD_PARTY_README Wed Jul 05 17:47:03 2017 +0200 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. -------------------------------------------------------------------------------
--- a/corba/.hgtags Wed Jun 22 12:41:28 2011 -0700 +++ b/corba/.hgtags Wed Jul 05 17:47:03 2017 +0200 @@ -120,3 +120,4 @@ 51ed32f6f4de56f16e910ac54ba6c6f6606f4f17 jdk7-b143 7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144 77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145 +770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
--- a/corba/THIRD_PARTY_README Wed Jun 22 12:41:28 2011 -0700 +++ b/corba/THIRD_PARTY_README Wed Jul 05 17:47:03 2017 +0200 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. -------------------------------------------------------------------------------
--- a/jaxp/.hgtags Wed Jun 22 12:41:28 2011 -0700 +++ b/jaxp/.hgtags Wed Jul 05 17:47:03 2017 +0200 @@ -120,3 +120,4 @@ 16b847e9bbd747f9d27785b2fc20d4d720cca893 jdk7-b143 39bf6dcaab2336326b21743cef7042d0a2de9ba0 jdk7-b144 10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145 +bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
--- a/jaxp/THIRD_PARTY_README Wed Jun 22 12:41:28 2011 -0700 +++ b/jaxp/THIRD_PARTY_README Wed Jul 05 17:47:03 2017 +0200 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. -------------------------------------------------------------------------------
--- a/jaxws/.hgtags Wed Jun 22 12:41:28 2011 -0700 +++ b/jaxws/.hgtags Wed Jul 05 17:47:03 2017 +0200 @@ -120,3 +120,4 @@ 569d1e7ea980d172046c4aba79d96b5c3afabbba jdk7-b143 6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144 42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145 +05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
--- a/jaxws/THIRD_PARTY_README Wed Jun 22 12:41:28 2011 -0700 +++ b/jaxws/THIRD_PARTY_README Wed Jul 05 17:47:03 2017 +0200 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. -------------------------------------------------------------------------------
--- a/jdk/.hgtags Wed Jun 22 12:41:28 2011 -0700 +++ b/jdk/.hgtags Wed Jul 05 17:47:03 2017 +0200 @@ -120,3 +120,4 @@ efbf75c24b0f31847c9c403f6dc07dc80551908d jdk7-b143 23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144 1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145 +539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
--- a/jdk/THIRD_PARTY_README Wed Jun 22 12:41:28 2011 -0700 +++ b/jdk/THIRD_PARTY_README Wed Jul 05 17:47:03 2017 +0200 @@ -1876,6 +1876,39 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to SoftFloat version 2b, which is +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. + +--- begin of LICENSE --- + +Use of any of this software is governed by the terms of the license below: + +SoftFloat was written by me, John R. Hauser. This work was made possible in +part by the International Computer Science Institute, located at Suite 600, +1947 Center Street, Berkeley, California 94704. Funding was partially +provided by the National Science Foundation under grant MIP-9311980. The +original version of this code was written as part of a project to build +a fixed-point vector processor in collaboration with the University of +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE +SOFTWARE. + +Derivative works are acceptable, even for commercial purposes, provided +that the minimal documentation requirements stated in the source code are +satisfied. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. -------------------------------------------------------------------------------