Merge jdk7-b147
authorlana
Wed, 22 Jun 2011 12:41:14 -0700
changeset 4373f097ca2434b1
parent 4370 7b4f4230fecf
parent 4372 cfd7602f5c52
child 4374 9b8c96f96a0f
child 4750 446b13a08aca
Merge
     1.1 --- a/THIRD_PARTY_README	Mon Jun 20 16:25:32 2011 -0700
     1.2 +++ b/THIRD_PARTY_README	Wed Jun 22 12:41:14 2011 -0700
     1.3 @@ -1876,6 +1876,39 @@
     1.4  
     1.5  -------------------------------------------------------------------------------
     1.6  
     1.7 +%% This notice is provided with respect to SoftFloat version 2b, which is 
     1.8 +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM.
     1.9 +
    1.10 +--- begin of LICENSE ---
    1.11 +
    1.12 +Use of any of this software is governed by the terms of the license below:
    1.13 +
    1.14 +SoftFloat was written by me, John R. Hauser. This work was made possible in 
    1.15 +part by the International Computer Science Institute, located at Suite 600, 
    1.16 +1947 Center Street, Berkeley, California 94704. Funding was partially 
    1.17 +provided by the National Science Foundation under grant MIP-9311980. The 
    1.18 +original version of this code was written as part of a project to build 
    1.19 +a fixed-point vector processor in collaboration with the University of 
    1.20 +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. 
    1.21 +
    1.22 +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort 
    1.23 +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT 
    1.24 +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO 
    1.25 +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL 
    1.26 +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO 
    1.27 +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER 
    1.28 +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, 
    1.29 +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE 
    1.30 +SOFTWARE. 
    1.31 +
    1.32 +Derivative works are acceptable, even for commercial purposes, provided 
    1.33 +that the minimal documentation requirements stated in the source code are 
    1.34 +satisfied. 
    1.35 +
    1.36 +--- end of LICENSE ---
    1.37 +
    1.38 +-------------------------------------------------------------------------------
    1.39 +
    1.40  %% Portions licensed from Taligent, Inc.
    1.41  
    1.42  -------------------------------------------------------------------------------