Mon, 27 Jun 2011 14:10:24 -0700
Merge
1.1 --- a/.hgtags Mon Jun 20 17:28:32 2011 -0700 1.2 +++ b/.hgtags Mon Jun 27 14:10:24 2011 -0700 1.3 @@ -121,3 +121,4 @@ 1.4 6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144 1.5 42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145 1.6 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 1.7 +d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
2.1 --- a/THIRD_PARTY_README Mon Jun 20 17:28:32 2011 -0700 2.2 +++ b/THIRD_PARTY_README Mon Jun 27 14:10:24 2011 -0700 2.3 @@ -1876,6 +1876,39 @@ 2.4 2.5 ------------------------------------------------------------------------------- 2.6 2.7 +%% This notice is provided with respect to SoftFloat version 2b, which is 2.8 +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM. 2.9 + 2.10 +--- begin of LICENSE --- 2.11 + 2.12 +Use of any of this software is governed by the terms of the license below: 2.13 + 2.14 +SoftFloat was written by me, John R. Hauser. This work was made possible in 2.15 +part by the International Computer Science Institute, located at Suite 600, 2.16 +1947 Center Street, Berkeley, California 94704. Funding was partially 2.17 +provided by the National Science Foundation under grant MIP-9311980. The 2.18 +original version of this code was written as part of a project to build 2.19 +a fixed-point vector processor in collaboration with the University of 2.20 +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. 2.21 + 2.22 +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort 2.23 +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT 2.24 +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO 2.25 +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL 2.26 +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO 2.27 +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER 2.28 +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, 2.29 +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE 2.30 +SOFTWARE. 2.31 + 2.32 +Derivative works are acceptable, even for commercial purposes, provided 2.33 +that the minimal documentation requirements stated in the source code are 2.34 +satisfied. 2.35 + 2.36 +--- end of LICENSE --- 2.37 + 2.38 +------------------------------------------------------------------------------- 2.39 + 2.40 %% Portions licensed from Taligent, Inc. 2.41 2.42 -------------------------------------------------------------------------------