From 6060a9693087ec71ab707092e919f02bdfc74e3d Mon Sep 17 00:00:00 2001 From: Shawn Landden Date: Sun, 26 Jul 2020 22:53:57 +0400 Subject: [PATCH] [Global] Clarify license as Apache 2.0 with LLVM Exceptions (#56) As discussed with Chris Lattner in #54, this was always the intent. The file include/circt/Dialect/FIRRTL/Passes.h already indicated the LLVM exceptions apply. This will be posted to discourse. If you are a significant contributor and object, we need to hear from you. --- LICENSE | 33 +++++++++++++++++++ .../HandshakeToFIRRTL/HandshakeToFIRRTL.h | 14 ++------ .../StandardToHandshake/StandardToHandshake.h | 14 ++------ .../Dialect/Handshake/HandshakeInterfaces.td | 14 ++------ .../circt/Dialect/Handshake/HandshakeOps.h | 14 ++------ .../circt/Dialect/Handshake/HandshakeOps.td | 14 ++------ .../HandshakeToFIRRTL/HandshakeToFIRRTL.cpp | 14 ++------ .../StandardToHandshake.cpp | 14 ++------ lib/Dialect/Handshake/HandshakeOps.cpp | 14 ++------ 9 files changed, 57 insertions(+), 88 deletions(-) diff --git a/LICENSE b/LICENSE index 261eeb9e9f..84f1108d2b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,8 @@ +============================================================================== +The LLVM Project is under the Apache License v2.0 with LLVM Exceptions: +As an incubator project with ambition to become part of the LLVM Project, +CIRCT is under the same license. +============================================================================== Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -199,3 +204,31 @@ 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. + +============================================================================== +Software from third parties included in the LLVM Project: +============================================================================== +The LLVM Project contains third party software which is under different license +terms. All such code will be identified clearly using at least one of two +mechanisms: +1) It will be in a separate directory tree with its own `LICENSE.txt` or + `LICENSE` file at the top containing the specific license and restrictions + which apply to that software, or +2) It will contain specific license and restriction terms at the top of every + file. diff --git a/include/circt/Conversion/HandshakeToFIRRTL/HandshakeToFIRRTL.h b/include/circt/Conversion/HandshakeToFIRRTL/HandshakeToFIRRTL.h index aa00e39a85..c8a022a8da 100644 --- a/include/circt/Conversion/HandshakeToFIRRTL/HandshakeToFIRRTL.h +++ b/include/circt/Conversion/HandshakeToFIRRTL/HandshakeToFIRRTL.h @@ -2,17 +2,9 @@ // // Copyright 2020 The CIRCT Authors. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception //===----------------------------------------------------------------------===// #ifndef CIRCT_CONVERSION_HANDSHAKETOFIRRTL_H_ diff --git a/include/circt/Conversion/StandardToHandshake/StandardToHandshake.h b/include/circt/Conversion/StandardToHandshake/StandardToHandshake.h index b29f7fe045..2aa20723a8 100755 --- a/include/circt/Conversion/StandardToHandshake/StandardToHandshake.h +++ b/include/circt/Conversion/StandardToHandshake/StandardToHandshake.h @@ -2,17 +2,9 @@ // // Copyright 2020 The CIRCT Authors. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // ============================================================================= #ifndef CIRCT_CONVERSION_STANDARDTOHANDSHAKE_H_ diff --git a/include/circt/Dialect/Handshake/HandshakeInterfaces.td b/include/circt/Dialect/Handshake/HandshakeInterfaces.td index 715eb889a7..e351ede53b 100644 --- a/include/circt/Dialect/Handshake/HandshakeInterfaces.td +++ b/include/circt/Dialect/Handshake/HandshakeInterfaces.td @@ -2,17 +2,9 @@ // // Copyright 2019 The CIRCT Authors. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // ============================================================================= // // diff --git a/include/circt/Dialect/Handshake/HandshakeOps.h b/include/circt/Dialect/Handshake/HandshakeOps.h index 3d16706a3f..209f65f40e 100644 --- a/include/circt/Dialect/Handshake/HandshakeOps.h +++ b/include/circt/Dialect/Handshake/HandshakeOps.h @@ -3,17 +3,9 @@ // // Copyright 2019 The CIRCT Authors. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // ============================================================================= // // This file defines convenience types for working with handshake operations. diff --git a/include/circt/Dialect/Handshake/HandshakeOps.td b/include/circt/Dialect/Handshake/HandshakeOps.td index 9081f4b350..f463eb8667 100644 --- a/include/circt/Dialect/Handshake/HandshakeOps.td +++ b/include/circt/Dialect/Handshake/HandshakeOps.td @@ -3,17 +3,9 @@ // // Copyright 2019 The CIRCT Authors. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // ============================================================================= // // diff --git a/lib/Conversion/HandshakeToFIRRTL/HandshakeToFIRRTL.cpp b/lib/Conversion/HandshakeToFIRRTL/HandshakeToFIRRTL.cpp index e64dc450b7..3c9df46358 100644 --- a/lib/Conversion/HandshakeToFIRRTL/HandshakeToFIRRTL.cpp +++ b/lib/Conversion/HandshakeToFIRRTL/HandshakeToFIRRTL.cpp @@ -2,17 +2,9 @@ // // Copyright 2019 The CIRCT Authors. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception //===----------------------------------------------------------------------===// #include "circt/Conversion/HandshakeToFIRRTL/HandshakeToFIRRTL.h" diff --git a/lib/Conversion/StandardToHandshake/StandardToHandshake.cpp b/lib/Conversion/StandardToHandshake/StandardToHandshake.cpp index 438a6b8884..b48994b81a 100644 --- a/lib/Conversion/StandardToHandshake/StandardToHandshake.cpp +++ b/lib/Conversion/StandardToHandshake/StandardToHandshake.cpp @@ -2,17 +2,9 @@ // // Copyright 2019 The CIRCT Authors. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // ============================================================================= #include "circt/Conversion/StandardToHandshake/StandardToHandshake.h" diff --git a/lib/Dialect/Handshake/HandshakeOps.cpp b/lib/Dialect/Handshake/HandshakeOps.cpp index ed3a1c8cbb..8b64351146 100644 --- a/lib/Dialect/Handshake/HandshakeOps.cpp +++ b/lib/Dialect/Handshake/HandshakeOps.cpp @@ -2,17 +2,9 @@ // // Copyright 2019 The CIRCT Authors. // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // ============================================================================= #include "circt/Dialect/Handshake/HandshakeOps.h"