diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml index 3de5d020bb..4011542acb 100644 --- a/cranelift/Cargo.toml +++ b/cranelift/Cargo.toml @@ -3,7 +3,7 @@ name = "cretonne-tools" authors = ["The Cretonne Project Developers"] version = "0.13.0" description = "Binaries for testing the Cretonne libraries" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" documentation = "https://cretonne.readthedocs.io/" repository = "https://github.com/cretonne/cretonne" publish = false diff --git a/cranelift/LICENSE b/cranelift/LICENSE index d645695673..be1d7c438a 100644 --- a/cranelift/LICENSE +++ b/cranelift/LICENSE @@ -200,3 +200,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + +--- LLVM Exceptions to the Apache 2.0 License ---- + +As an exception, if, as a result of your compiling your source code, portions +of this Software are embedded into an Object form of such source code, you +may redistribute such embedded portions in such Object form without complying +with the conditions of Sections 4(a), 4(b) and 4(d) of the License. + +In addition, if you combine or link compiled forms of this Software with +software that is licensed under the GPLv2 ("Combined Software") and if a +court of competent jurisdiction determines that the patent provision (Section +3), the indemnity provision (Section 9) or other Section of the License +conflicts with the conditions of the GPLv2, you may retroactively and +prospectively choose to deem waived or otherwise exclude such Section(s) of +the License, but only in their entirety and only with respect to the Combined +Software. diff --git a/lib/codegen/Cargo.toml b/lib/codegen/Cargo.toml index 415aa6534a..e5a50d258b 100644 --- a/lib/codegen/Cargo.toml +++ b/lib/codegen/Cargo.toml @@ -3,7 +3,7 @@ authors = ["The Cretonne Project Developers"] name = "cretonne-codegen" version = "0.13.0" description = "Low-level code generator library" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" documentation = "https://cretonne.readthedocs.io/" repository = "https://github.com/cretonne/cretonne" readme = "README.md" diff --git a/lib/entity/Cargo.toml b/lib/entity/Cargo.toml index d438f4e065..a836db8293 100644 --- a/lib/entity/Cargo.toml +++ b/lib/entity/Cargo.toml @@ -3,7 +3,7 @@ authors = ["The Cretonne Project Developers"] name = "cretonne-entity" version = "0.13.0" description = "Data structures using entity references as mapping keys" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" documentation = "https://cretonne.readthedocs.io/" repository = "https://github.com/cretonne/cretonne" readme = "README.md" diff --git a/lib/faerie/Cargo.toml b/lib/faerie/Cargo.toml index cc248678d3..08760e8cd3 100644 --- a/lib/faerie/Cargo.toml +++ b/lib/faerie/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The Cretonne Project Developers"] description = "Emit Cretonne output to native object files with Faerie" repository = "https://github.com/cretonne/cretonne" documentation = "https://cretonne.readthedocs.io/" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" readme = "README.md" [dependencies] diff --git a/lib/filetests/Cargo.toml b/lib/filetests/Cargo.toml index 2ff5589d16..2ed1e7db8d 100644 --- a/lib/filetests/Cargo.toml +++ b/lib/filetests/Cargo.toml @@ -3,7 +3,7 @@ name = "cretonne-filetests" authors = ["The Cretonne Project Developers"] version = "0.13.0" description = "Test driver and implementations of the filetest commands" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" documentation = "https://cretonne.readthedocs.io/en/latest/testing.html#file-tests" repository = "https://github.com/cretonne/cretonne" publish = false diff --git a/lib/frontend/Cargo.toml b/lib/frontend/Cargo.toml index aef504dfe6..9740c124bc 100644 --- a/lib/frontend/Cargo.toml +++ b/lib/frontend/Cargo.toml @@ -3,7 +3,7 @@ authors = ["The Cretonne Project Developers"] name = "cretonne-frontend" version = "0.13.0" description = "Cretonne IR builder helper" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" documentation = "https://cretonne.readthedocs.io/" repository = "https://github.com/cretonne/cretonne" readme = "README.md" diff --git a/lib/module/Cargo.toml b/lib/module/Cargo.toml index de97231b33..85bc72d9eb 100644 --- a/lib/module/Cargo.toml +++ b/lib/module/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The Cretonne Project Developers"] description = "Support for linking functions and data with Cretonne" repository = "https://github.com/cretonne/cretonne" documentation = "https://cretonne.readthedocs.io/" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" readme = "README.md" [dependencies] diff --git a/lib/native/Cargo.toml b/lib/native/Cargo.toml index 0efa247104..1c566349f3 100644 --- a/lib/native/Cargo.toml +++ b/lib/native/Cargo.toml @@ -4,7 +4,7 @@ version = "0.13.0" authors = ["The Cretonne Project Developers"] description = "Support for targeting the host with Cretonne" repository = "https://github.com/cretonne/cretonne" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" readme = "README.md" [dependencies] diff --git a/lib/reader/Cargo.toml b/lib/reader/Cargo.toml index b6b3a19b50..252587e5cf 100644 --- a/lib/reader/Cargo.toml +++ b/lib/reader/Cargo.toml @@ -3,7 +3,7 @@ authors = ["The Cretonne Project Developers"] name = "cretonne-reader" version = "0.13.0" description = "Cretonne textual IR reader" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" documentation = "https://cretonne.readthedocs.io/" repository = "https://github.com/cretonne/cretonne" readme = "README.md" diff --git a/lib/simplejit/Cargo.toml b/lib/simplejit/Cargo.toml index 8d359ac48d..06f9f1b33c 100644 --- a/lib/simplejit/Cargo.toml +++ b/lib/simplejit/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The Cretonne Project Developers"] description = "A simple JIT library backed by Cretonne" repository = "https://github.com/cretonne/cretonne" documentation = "https://cretonne.readthedocs.io/" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" readme = "README.md" [dependencies] diff --git a/lib/umbrella/Cargo.toml b/lib/umbrella/Cargo.toml index a23be961cb..ef3b6a9db5 100644 --- a/lib/umbrella/Cargo.toml +++ b/lib/umbrella/Cargo.toml @@ -3,7 +3,7 @@ authors = ["The Cretonne Project Developers"] name = "cretonne" version = "0.13.0" description = "Umbrella for commonly-used cretonne crates" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" documentation = "https://cretonne.readthedocs.io/" repository = "https://github.com/cretonne/cretonne" readme = "README.md" diff --git a/lib/wasm/Cargo.toml b/lib/wasm/Cargo.toml index 4fece39a1c..8db1c1665e 100644 --- a/lib/wasm/Cargo.toml +++ b/lib/wasm/Cargo.toml @@ -4,7 +4,7 @@ version = "0.13.0" authors = ["The Cretonne Project Developers"] description = "Translator from WebAssembly to Cretonne IR" repository = "https://github.com/cretonne/cretonne" -license = "Apache-2.0" +license = "Apache-2.0 WITH LLVM-exception" readme = "README.md" keywords = ["webassembly", "wasm"]