Skip to content

Commit d64750d

Browse files
tgross35tgross35
committed
Update licensing to Apache-2.0 WITH LLVM-exception AND MIT
Currently, Cargo.toml specifies Apache-2.0 OR MIT, but LICENSE.txt describes MIT OR NCSA. compiler-builtins is derived from LLVM's compiler-rt. LICENSE.txt correctly reflects the state of compiler-rt prior to relicensing on 2019-01-19, during which time software was available for use under either MIT or the University of Illinois NCSA license. After relicensing, however, compiler-rt is available for use only under Apache-2.0 with the LLVM exception; this is not reflected anywhere in the repository. Update the SPDX license identifier to `Apache-2.0 WITH LLVM-exception AND MIT AND (MIT OR Apache-2.0)`. Each AND portion covers something specific: * Apache-2.0 WITH LLVM-exception: this covers work that is derived from the LLVM repository since after the LLVM relicensing. * MIT: This covers work that is derived from LLVM before the LLVM relicensing (under MIT OR NCSA). * MIT AND Apache-2.0: This ensures that any contributions to this repository, in addition to meeting the above required licenses, is also released for use under the Rust-standard Apache-2.0 with no LLVM exception. Fixes: #307 Closes: #511
1 parent adaef32 commit d64750d

File tree

2 files changed

+246
-70
lines changed

2 files changed

+246
-70
lines changed

Diff for: ‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
authors = ["Jorge Aparicio <[email protected]>"]
33
name = "compiler_builtins"
44
version = "0.1.135"
5-
license = "MIT/Apache-2.0"
5+
license = "Apache-2.0 WITH LLVM-exception AND MIT AND (MIT OR Apache-2.0)"
66
readme = "README.md"
77
repository = "https://github.com/rust-lang/compiler-builtins"
88
homepage = "https://github.com/rust-lang/compiler-builtins"

Diff for: ‎LICENSE.txt

+245-69
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,267 @@
1-
==============================================================================
2-
compiler-builtins License
3-
==============================================================================
1+
compiler-builtins as a whole is available for use under both the MIT license
2+
and the Apache-2.0 license with the LLVM exception (Apache-2.0 WITH
3+
LLVM-exception AND MIT).
44

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.
5+
As a contributor, you agree that your code can be used under either the MIT
6+
license, or the Apache-2.0 license, or the Apache-2.0 license with the LLVM
7+
exception.
98

10-
Full text of the relevant licenses is included below.
9+
Text of the relevant licenses is provided below:
1110

12-
==============================================================================
11+
------------------------------------------------------------------------------
12+
MIT License
1313

14-
University of Illinois/NCSA
15-
Open Source License
14+
Permission is hereby granted, free of charge, to any person obtaining a copy
15+
of this software and associated documentation files (the "Software"), to deal
16+
in the Software without restriction, including without limitation the rights
17+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
18+
copies of the Software, and to permit persons to whom the Software is
19+
furnished to do so, subject to the following conditions:
1620

17-
Copyright (c) 2009-2016 by the contributors listed in CREDITS.TXT
21+
The above copyright notice and this permission notice shall be included in all
22+
copies or substantial portions of the Software.
1823

19-
All rights reserved.
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
25+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
26+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
27+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
28+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
29+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30+
SOFTWARE.
31+
------------------------------------------------------------------------------
32+
Apache License
33+
Version 2.0, January 2004
34+
http://www.apache.org/licenses/
2035

21-
Developed by:
36+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
2237

23-
LLVM Team
38+
1. Definitions.
2439

25-
University of Illinois at Urbana-Champaign
40+
"License" shall mean the terms and conditions for use, reproduction,
41+
and distribution as defined by Sections 1 through 9 of this document.
2642

27-
http://llvm.org
43+
"Licensor" shall mean the copyright owner or entity authorized by
44+
the copyright owner that is granting the License.
2845

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:
46+
"Legal Entity" shall mean the union of the acting entity and all
47+
other entities that control, are controlled by, or are under common
48+
control with that entity. For the purposes of this definition,
49+
"control" means (i) the power, direct or indirect, to cause the
50+
direction or management of such entity, whether by contract or
51+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
52+
outstanding shares, or (iii) beneficial ownership of such entity.
3553

36-
* Redistributions of source code must retain the above copyright notice,
37-
this list of conditions and the following disclaimers.
54+
"You" (or "Your") shall mean an individual or Legal Entity
55+
exercising permissions granted by this License.
3856

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.
57+
"Source" form shall mean the preferred form for making modifications,
58+
including but not limited to software source code, documentation
59+
source, and configuration files.
4260

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.
61+
"Object" form shall mean any form resulting from mechanical
62+
transformation or translation of a Source form, including but
63+
not limited to compiled object code, generated documentation,
64+
and conversions to other media types.
4765

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.
66+
"Work" shall mean the work of authorship, whether in Source or
67+
Object form, made available under the License, as indicated by a
68+
copyright notice that is included in or attached to the work
69+
(an example is provided in the Appendix below).
5570

56-
==============================================================================
71+
"Derivative Works" shall mean any work, whether in Source or Object
72+
form, that is based on (or derived from) the Work and for which the
73+
editorial revisions, annotations, elaborations, or other modifications
74+
represent, as a whole, an original work of authorship. For the purposes
75+
of this License, Derivative Works shall not include works that remain
76+
separable from, or merely link (or bind by name) to the interfaces of,
77+
the Work and Derivative Works thereof.
5778

58-
Copyright (c) 2009-2015 by the contributors listed in CREDITS.TXT
79+
"Contribution" shall mean any work of authorship, including
80+
the original version of the Work and any modifications or additions
81+
to that Work or Derivative Works thereof, that is intentionally
82+
submitted to Licensor for inclusion in the Work by the copyright owner
83+
or by an individual or Legal Entity authorized to submit on behalf of
84+
the copyright owner. For the purposes of this definition, "submitted"
85+
means any form of electronic, verbal, or written communication sent
86+
to the Licensor or its representatives, including but not limited to
87+
communication on electronic mailing lists, source code control systems,
88+
and issue tracking systems that are managed by, or on behalf of, the
89+
Licensor for the purpose of discussing and improving the Work, but
90+
excluding communication that is conspicuously marked or otherwise
91+
designated in writing by the copyright owner as "Not a Contribution."
5992

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:
93+
"Contributor" shall mean Licensor and any individual or Legal Entity
94+
on behalf of whom a Contribution has been received by Licensor and
95+
subsequently incorporated within the Work.
6696

67-
The above copyright notice and this permission notice shall be included in
68-
all copies or substantial portions of the Software.
97+
2. Grant of Copyright License. Subject to the terms and conditions of
98+
this License, each Contributor hereby grants to You a perpetual,
99+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
100+
copyright license to reproduce, prepare Derivative Works of,
101+
publicly display, publicly perform, sublicense, and distribute the
102+
Work and such Derivative Works in Source or Object form.
69103

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
104+
3. Grant of Patent License. Subject to the terms and conditions of
105+
this License, each Contributor hereby grants to You a perpetual,
106+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
107+
(except as stated in this section) patent license to make, have made,
108+
use, offer to sell, sell, import, and otherwise transfer the Work,
109+
where such license applies only to those patent claims licensable
110+
by such Contributor that are necessarily infringed by their
111+
Contribution(s) alone or by combination of their Contribution(s)
112+
with the Work to which such Contribution(s) was submitted. If You
113+
institute patent litigation against any entity (including a
114+
cross-claim or counterclaim in a lawsuit) alleging that the Work
115+
or a Contribution incorporated within the Work constitutes direct
116+
or contributory patent infringement, then any patent licenses
117+
granted to You under this License for that Work shall terminate
118+
as of the date such litigation is filed.
119+
120+
4. Redistribution. You may reproduce and distribute copies of the
121+
Work or Derivative Works thereof in any medium, with or without
122+
modifications, and in Source or Object form, provided that You
123+
meet the following conditions:
124+
125+
(a) You must give any other recipients of the Work or
126+
Derivative Works a copy of this License; and
127+
128+
(b) You must cause any modified files to carry prominent notices
129+
stating that You changed the files; and
130+
131+
(c) You must retain, in the Source form of any Derivative Works
132+
that You distribute, all copyright, patent, trademark, and
133+
attribution notices from the Source form of the Work,
134+
excluding those notices that do not pertain to any part of
135+
the Derivative Works; and
136+
137+
(d) If the Work includes a "NOTICE" text file as part of its
138+
distribution, then any Derivative Works that You distribute must
139+
include a readable copy of the attribution notices contained
140+
within such NOTICE file, excluding those notices that do not
141+
pertain to any part of the Derivative Works, in at least one
142+
of the following places: within a NOTICE text file distributed
143+
as part of the Derivative Works; within the Source form or
144+
documentation, if provided along with the Derivative Works; or,
145+
within a display generated by the Derivative Works, if and
146+
wherever such third-party notices normally appear. The contents
147+
of the NOTICE file are for informational purposes only and
148+
do not modify the License. You may add Your own attribution
149+
notices within Derivative Works that You distribute, alongside
150+
or as an addendum to the NOTICE text from the Work, provided
151+
that such additional attribution notices cannot be construed
152+
as modifying the License.
153+
154+
You may add Your own copyright statement to Your modifications and
155+
may provide additional or different license terms and conditions
156+
for use, reproduction, or distribution of Your modifications, or
157+
for any such Derivative Works as a whole, provided Your use,
158+
reproduction, and distribution of the Work otherwise complies with
159+
the conditions stated in this License.
160+
161+
5. Submission of Contributions. Unless You explicitly state otherwise,
162+
any Contribution intentionally submitted for inclusion in the Work
163+
by You to the Licensor shall be under the terms and conditions of
164+
this License, without any additional terms or conditions.
165+
Notwithstanding the above, nothing herein shall supersede or modify
166+
the terms of any separate license agreement you may have executed
167+
with Licensor regarding such Contributions.
168+
169+
6. Trademarks. This License does not grant permission to use the trade
170+
names, trademarks, service marks, or product names of the Licensor,
171+
except as required for reasonable and customary use in describing the
172+
origin of the Work and reproducing the content of the NOTICE file.
173+
174+
7. Disclaimer of Warranty. Unless required by applicable law or
175+
agreed to in writing, Licensor provides the Work (and each
176+
Contributor provides its Contributions) on an "AS IS" BASIS,
177+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
178+
implied, including, without limitation, any warranties or conditions
179+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
180+
PARTICULAR PURPOSE. You are solely responsible for determining the
181+
appropriateness of using or redistributing the Work and assume any
182+
risks associated with Your exercise of permissions under this License.
183+
184+
8. Limitation of Liability. In no event and under no legal theory,
185+
whether in tort (including negligence), contract, or otherwise,
186+
unless required by applicable law (such as deliberate and grossly
187+
negligent acts) or agreed to in writing, shall any Contributor be
188+
liable to You for damages, including any direct, indirect, special,
189+
incidental, or consequential damages of any character arising as a
190+
result of this License or out of the use or inability to use the
191+
Work (including but not limited to damages for loss of goodwill,
192+
work stoppage, computer failure or malfunction, or any and all
193+
other commercial damages or losses), even if such Contributor
194+
has been advised of the possibility of such damages.
195+
196+
9. Accepting Warranty or Additional Liability. While redistributing
197+
the Work or Derivative Works thereof, You may choose to offer,
198+
and charge a fee for, acceptance of support, warranty, indemnity,
199+
or other liability obligations and/or rights consistent with this
200+
License. However, in accepting such obligations, You may act only
201+
on Your own behalf and on Your sole responsibility, not on behalf
202+
of any other Contributor, and only if You agree to indemnify,
203+
defend, and hold each Contributor harmless for any liability
204+
incurred by, or claims asserted against, such Contributor by reason
205+
of your accepting any such warranty or additional liability.
206+
207+
END OF TERMS AND CONDITIONS
208+
209+
APPENDIX: How to apply the Apache License to your work.
210+
211+
To apply the Apache License to your work, attach the following
212+
boilerplate notice, with the fields enclosed by brackets "[]"
213+
replaced with your own identifying information. (Don't include
214+
the brackets!) The text should be enclosed in the appropriate
215+
comment syntax for the file format. We also recommend that a
216+
file or class name and description of purpose be included on the
217+
same "printed page" as the copyright notice for easier
218+
identification within third-party archives.
219+
220+
Licensed under the Apache License, Version 2.0 (the "License");
221+
you may not use this file except in compliance with the License.
222+
You may obtain a copy of the License at
223+
224+
http://www.apache.org/licenses/LICENSE-2.0
225+
226+
Unless required by applicable law or agreed to in writing, software
227+
distributed under the License is distributed on an "AS IS" BASIS,
228+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
229+
See the License for the specific language governing permissions and
230+
limitations under the License.
231+
232+
233+
---- LLVM Exceptions to the Apache 2.0 License ----
234+
235+
As an exception, if, as a result of your compiling your source code, portions
236+
of this Software are embedded into an Object form of such source code, you
237+
may redistribute such embedded portions in such Object form without complying
238+
with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
239+
240+
In addition, if you combine or link compiled forms of this Software with
241+
software that is licensed under the GPLv2 ("Combined Software") and if a
242+
court of competent jurisdiction determines that the patent provision (Section
243+
3), the indemnity provision (Section 9) or other Section of the License
244+
conflicts with the conditions of the GPLv2, you may retroactively and
245+
prospectively choose to deem waived or otherwise exclude such Section(s) of
246+
the License, but only in their entirety and only with respect to the Combined
90247
Software.
248+
------------------------------------------------------------------------------
249+
250+
Portions of this software are derived from third-party works licensed under
251+
terms compatible with the above Apache-2.0 WITH LLVM-exception AND MIT
252+
license:
253+
254+
* compiler-builtins is derived from LLVM's compiler-rt (https://llvm.org/).
255+
Work derived form compiler-rt prior to 2019-01-19 is usable under the MIT
256+
license, with the following copyright:
257+
258+
Copyright (c) 2009-2016 by the contributors listed in CREDITS.TXT
259+
260+
* Work derived from compiler-rt after 2019-01-19 is usable under the
261+
Apache-2.0 license with the LLVM exception.
262+
263+
* The bundled `math` module is from rust-lang/libm, usable under the MIT
264+
license. See https://github.com/rust-lang/libm for details.
91265

266+
Additionally, some source files may contain comments with specific copyrights
267+
or licenses.

0 commit comments

Comments
 (0)