Merge
This commit is contained in:
commit
4cdda07519
@ -120,3 +120,4 @@ cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142
|
|||||||
14b8e7eee1058fd4ed5a2700a2ce14b3616278f1 jdk7-b143
|
14b8e7eee1058fd4ed5a2700a2ce14b3616278f1 jdk7-b143
|
||||||
7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
|
7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
|
||||||
55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
|
55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
|
||||||
|
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
|
||||||
|
@ -1876,6 +1876,39 @@ with JRE 7, JDK 7, and OpenJDK 7.
|
|||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
%% 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.
|
%% Portions licensed from Taligent, Inc.
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
@ -120,3 +120,4 @@ a2f340a048c88d10cbedc0504f5cf03d39925a40 jdk7-b142
|
|||||||
51ed32f6f4de56f16e910ac54ba6c6f6606f4f17 jdk7-b143
|
51ed32f6f4de56f16e910ac54ba6c6f6606f4f17 jdk7-b143
|
||||||
7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
|
7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
|
||||||
77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
|
77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
|
||||||
|
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
|
||||||
|
@ -1876,6 +1876,39 @@ with JRE 7, JDK 7, and OpenJDK 7.
|
|||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
%% 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.
|
%% Portions licensed from Taligent, Inc.
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
@ -120,3 +120,4 @@ d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139
|
|||||||
efbf75c24b0f31847c9c403f6dc07dc80551908d jdk7-b143
|
efbf75c24b0f31847c9c403f6dc07dc80551908d jdk7-b143
|
||||||
23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144
|
23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144
|
||||||
1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145
|
1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145
|
||||||
|
539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
|
||||||
|
@ -1876,6 +1876,39 @@ with JRE 7, JDK 7, and OpenJDK 7.
|
|||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
%% 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.
|
%% Portions licensed from Taligent, Inc.
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user