Merge pull request #15 from cfallin/relicensing

Relicense fully to Apache-2.0 WITH LLVM-exception.
bytecodealliance · Nov 18, 2021 · c7bc6c9 · c7bc6c9
2 parents 9774e97 + cf0d515
commit c7bc6c9
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 442 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ name = "regalloc2"
 version = "0.0.1"
 authors = ["Chris Fallin <chris@cfallin.org>", "Mozilla SpiderMonkey Developers"]
 edition = "2018"
-license = "Apache-2.0 WITH LLVM-exception AND MPL-2.0"
+license = "Apache-2.0 WITH LLVM-exception"
 description = "Backtracking register allocator inspired from IonMonkey"
 repository = "https://github.com/bytecodealliance/regalloc2"
 

diff --git a/README.md b/README.md
@@ -15,18 +15,8 @@ how the allocator works.
 
 ## License
 
-Unless otherwise specified, code in this crate is licensed under the Apache 2.0
-License with LLVM Exception. This license text can be found in the file
-`LICENSE`.
-
-Files in the `src/ion/` directory are directly ported from original C++ code in
-IonMonkey, a part of the Firefox codebase. Parts of `src/lib.rs` are also
-definitions that are directly translated from this original code. As a result,
-these files are derivative works and are covered by the Mozilla Public License
-(MPL) 2.0, as described in license headers in those files. Please see the
-notices in relevant files for links to the original IonMonkey source files from
-which they have been translated/derived. The MPL text can be found in
-`src/ion/LICENSE`.
+This crate is licensed under the Apache 2.0 License with LLVM
+Exception. This license text can be found in the file `LICENSE`.
 
 Parts of the code are derived from regalloc.rs: in particular,
 `src/checker.rs` and `src/domtree.rs`. This crate has the same license

diff --git a/src/ion/LICENSE b/src/ion/LICENSE
diff --git a/src/ion/data_structures.rs b/src/ion/data_structures.rs
@@ -1,11 +1,10 @@
 /*
- * The following license applies to this file, which was initially
- * derived from the files `js/src/jit/BacktrackingAllocator.h` and
- * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * This file was initially derived from the files
+ * `js/src/jit/BacktrackingAllocator.h` and
+ * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox, and was
+ * originally licensed under the Mozilla Public License 2.0. We
+ * subsequently relicensed it to Apache-2.0 WITH LLVM-exception (see
+ * https://github.com/bytecodealliance/regalloc2/issues/7).
  *
  * Since the initial port, the design has been substantially evolved
  * and optimized.

diff --git a/src/ion/liveranges.rs b/src/ion/liveranges.rs
@@ -1,11 +1,10 @@
 /*
- * The following license applies to this file, which was initially
- * derived from the files `js/src/jit/BacktrackingAllocator.h` and
- * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * This file was initially derived from the files
+ * `js/src/jit/BacktrackingAllocator.h` and
+ * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox, and was
+ * originally licensed under the Mozilla Public License 2.0. We
+ * subsequently relicensed it to Apache-2.0 WITH LLVM-exception (see
+ * https://github.com/bytecodealliance/regalloc2/issues/7).
  *
  * Since the initial port, the design has been substantially evolved
  * and optimized.

diff --git a/src/ion/merge.rs b/src/ion/merge.rs
@@ -1,11 +1,10 @@
 /*
- * The following license applies to this file, which was initially
- * derived from the files `js/src/jit/BacktrackingAllocator.h` and
- * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * This file was initially derived from the files
+ * `js/src/jit/BacktrackingAllocator.h` and
+ * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox, and was
+ * originally licensed under the Mozilla Public License 2.0. We
+ * subsequently relicensed it to Apache-2.0 WITH LLVM-exception (see
+ * https://github.com/bytecodealliance/regalloc2/issues/7).
  *
  * Since the initial port, the design has been substantially evolved
  * and optimized.

diff --git a/src/ion/mod.rs b/src/ion/mod.rs
@@ -1,11 +1,10 @@
 /*
- * The following license applies to this file, which was initially
- * derived from the files `js/src/jit/BacktrackingAllocator.h` and
- * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * This file was initially derived from the files
+ * `js/src/jit/BacktrackingAllocator.h` and
+ * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox, and was
+ * originally licensed under the Mozilla Public License 2.0. We
+ * subsequently relicensed it to Apache-2.0 WITH LLVM-exception (see
+ * https://github.com/bytecodealliance/regalloc2/issues/7).
  *
  * Since the initial port, the design has been substantially evolved
  * and optimized.

diff --git a/src/ion/moves.rs b/src/ion/moves.rs
@@ -1,11 +1,10 @@
 /*
- * The following license applies to this file, which was initially
- * derived from the files `js/src/jit/BacktrackingAllocator.h` and
- * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * This file was initially derived from the files
+ * `js/src/jit/BacktrackingAllocator.h` and
+ * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox, and was
+ * originally licensed under the Mozilla Public License 2.0. We
+ * subsequently relicensed it to Apache-2.0 WITH LLVM-exception (see
+ * https://github.com/bytecodealliance/regalloc2/issues/7).
  *
  * Since the initial port, the design has been substantially evolved
  * and optimized.

diff --git a/src/ion/process.rs b/src/ion/process.rs
@@ -1,11 +1,10 @@
 /*
- * The following license applies to this file, which was initially
- * derived from the files `js/src/jit/BacktrackingAllocator.h` and
- * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * This file was initially derived from the files
+ * `js/src/jit/BacktrackingAllocator.h` and
+ * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox, and was
+ * originally licensed under the Mozilla Public License 2.0. We
+ * subsequently relicensed it to Apache-2.0 WITH LLVM-exception (see
+ * https://github.com/bytecodealliance/regalloc2/issues/7).
  *
  * Since the initial port, the design has been substantially evolved
  * and optimized.

diff --git a/src/ion/requirement.rs b/src/ion/requirement.rs
@@ -1,3 +1,15 @@
+/*
+ * This file was initially derived from the files
+ * `js/src/jit/BacktrackingAllocator.h` and
+ * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox, and was
+ * originally licensed under the Mozilla Public License 2.0. We
+ * subsequently relicensed it to Apache-2.0 WITH LLVM-exception (see
+ * https://github.com/bytecodealliance/regalloc2/issues/7).
+ *
+ * Since the initial port, the design has been substantially evolved
+ * and optimized.
+ */
+
 //! Requirements computation.
 
 use super::{Env, LiveBundleIndex};

diff --git a/src/ion/spill.rs b/src/ion/spill.rs
@@ -1,11 +1,10 @@
 /*
- * The following license applies to this file, which was initially
- * derived from the files `js/src/jit/BacktrackingAllocator.h` and
- * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * This file was initially derived from the files
+ * `js/src/jit/BacktrackingAllocator.h` and
+ * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox, and was
+ * originally licensed under the Mozilla Public License 2.0. We
+ * subsequently relicensed it to Apache-2.0 WITH LLVM-exception (see
+ * https://github.com/bytecodealliance/regalloc2/issues/7).
  *
  * Since the initial port, the design has been substantially evolved
  * and optimized.

diff --git a/src/ion/stackmap.rs b/src/ion/stackmap.rs
@@ -1,11 +1,10 @@
 /*
- * The following license applies to this file, which was initially
- * derived from the files `js/src/jit/BacktrackingAllocator.h` and
- * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox:
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * This file was initially derived from the files
+ * `js/src/jit/BacktrackingAllocator.h` and
+ * `js/src/jit/BacktrackingAllocator.cpp` in Mozilla Firefox, and was
+ * originally licensed under the Mozilla Public License 2.0. We
+ * subsequently relicensed it to Apache-2.0 WITH LLVM-exception (see
+ * https://github.com/bytecodealliance/regalloc2/issues/7).
  *
  * Since the initial port, the design has been substantially evolved
  * and optimized.