Skip to content

Commit c064549

Browse files
committed
Correct the license to that of upstream compiler-rt
As this is a derivative work we must maintain the same license terms.
1 parent e441058 commit c064549

File tree

4 files changed

+96
-232
lines changed

4 files changed

+96
-232
lines changed

LICENSE-APACHE

-201
This file was deleted.

LICENSE-MIT

-25
This file was deleted.

LICENSE.TXT

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
==============================================================================
2+
compiler-builtins License
3+
==============================================================================
4+
5+
The compiler-builtins crate is dual licensed under both the University of
6+
Illinois "BSD-Like" license and the MIT license. As a user of this code you may
7+
choose to use it under either license. As a contributor, you agree to allow
8+
your code to be used under both.
9+
10+
Full text of the relevant licenses is included below.
11+
12+
==============================================================================
13+
14+
University of Illinois/NCSA
15+
Open Source License
16+
17+
Copyright (c) 2009-2016 by the contributors listed in CREDITS.TXT
18+
19+
All rights reserved.
20+
21+
Developed by:
22+
23+
LLVM Team
24+
25+
University of Illinois at Urbana-Champaign
26+
27+
http://llvm.org
28+
29+
Permission is hereby granted, free of charge, to any person obtaining a copy of
30+
this software and associated documentation files (the "Software"), to deal with
31+
the Software without restriction, including without limitation the rights to
32+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
33+
of the Software, and to permit persons to whom the Software is furnished to do
34+
so, subject to the following conditions:
35+
36+
* Redistributions of source code must retain the above copyright notice,
37+
this list of conditions and the following disclaimers.
38+
39+
* Redistributions in binary form must reproduce the above copyright notice,
40+
this list of conditions and the following disclaimers in the
41+
documentation and/or other materials provided with the distribution.
42+
43+
* Neither the names of the LLVM Team, University of Illinois at
44+
Urbana-Champaign, nor the names of its contributors may be used to
45+
endorse or promote products derived from this Software without specific
46+
prior written permission.
47+
48+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
49+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
50+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
51+
CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
52+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
53+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
54+
SOFTWARE.
55+
56+
==============================================================================
57+
58+
Copyright (c) 2009-2015 by the contributors listed in CREDITS.TXT
59+
60+
Permission is hereby granted, free of charge, to any person obtaining a copy
61+
of this software and associated documentation files (the "Software"), to deal
62+
in the Software without restriction, including without limitation the rights
63+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
64+
copies of the Software, and to permit persons to whom the Software is
65+
furnished to do so, subject to the following conditions:
66+
67+
The above copyright notice and this permission notice shall be included in
68+
all copies or substantial portions of the Software.
69+
70+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
71+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
72+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
73+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
74+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
75+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
76+
THE SOFTWARE.
77+
78+
==============================================================================
79+
Copyrights and Licenses for Third Party Software Distributed with LLVM:
80+
==============================================================================
81+
The LLVM software contains code written by third parties. Such software will
82+
have its own individual LICENSE.TXT file in the directory in which it appears.
83+
This file will describe the copyrights, license, and restrictions which apply
84+
to that code.
85+
86+
The disclaimer of warranty in the University of Illinois Open Source License
87+
applies to all code in the LLVM Distribution, and nothing in any of the
88+
other licenses gives permission to use the names of the LLVM Team or the
89+
University of Illinois to endorse or promote products derived from this
90+
Software.
91+

README.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,12 @@ Floating-point implementations of builtins that are only called from soft-float
371371

372372
## License
373373

374-
Licensed under either of
374+
The compiler-builtins crate is dual licensed under both the University of
375+
Illinois "BSD-Like" license and the MIT license. As a user of this code you may
376+
choose to use it under either license. As a contributor, you agree to allow
377+
your code to be used under both.
375378

376-
- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
377-
http://www.apache.org/licenses/LICENSE-2.0)
378-
- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
379-
380-
at your option.
379+
Full text of the relevant licenses is in LICENSE.TXT.
381380

382381
### Contribution
383382

0 commit comments

Comments
 (0)