* [PULL 1/4] tcg/aarch64/tcg-target.opc.h: Add copyright/license
2019-11-11 15:55 [PULL 0/4] tcg patch queue Richard Henderson
@ 2019-11-11 15:55 ` Richard Henderson
2019-11-11 15:55 ` [PULL 2/4] tcg/i386/tcg-target.opc.h: " Richard Henderson
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2019-11-11 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
From: Peter Maydell <peter.maydell@linaro.org>
Add the copyright/license boilerplate for target/aarch64/tcg-target.opc.h.
This file has only had two commits: 14e4c1e2355473ccb29
and 79525dfd08262d8, both by the same Linaro engineer.
The license is GPL-2-or-later, since that's what the
rest of tcg/aarch64 uses.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191025155848.17362-2-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/aarch64/tcg-target.opc.h | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/tcg/aarch64/tcg-target.opc.h b/tcg/aarch64/tcg-target.opc.h
index 59e1d3f7f7..26bfd9c460 100644
--- a/tcg/aarch64/tcg-target.opc.h
+++ b/tcg/aarch64/tcg-target.opc.h
@@ -1,5 +1,14 @@
-/* Target-specific opcodes for host vector expansion. These will be
- emitted by tcg_expand_vec_op. For those familiar with GCC internals,
- consider these to be UNSPEC with names. */
+/*
+ * Copyright (c) 2019 Linaro
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * (at your option) any later version.
+ *
+ * See the COPYING file in the top-level directory for details.
+ *
+ * Target-specific opcodes for host vector expansion. These will be
+ * emitted by tcg_expand_vec_op. For those familiar with GCC internals,
+ * consider these to be UNSPEC with names.
+ */
DEF(aa64_sshl_vec, 1, 2, 0, IMPLVEC)
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PULL 2/4] tcg/i386/tcg-target.opc.h: Add copyright/license
2019-11-11 15:55 [PULL 0/4] tcg patch queue Richard Henderson
2019-11-11 15:55 ` [PULL 1/4] tcg/aarch64/tcg-target.opc.h: Add copyright/license Richard Henderson
@ 2019-11-11 15:55 ` Richard Henderson
2019-11-11 15:55 ` [PULL 3/4] tcg/ppc/tcg-target.opc.h: " Richard Henderson
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2019-11-11 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
From: Peter Maydell <peter.maydell@linaro.org>
Add the copyright/license boilerplate for tcg/i386/tcg-target.opc.h.
This file has had only one commit, 770c2fc7bb70804a, by
a Linaro engineer.
The license is MIT, since that's what the rest of tcg/i386/ is.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191025155848.17362-3-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/i386/tcg-target.opc.h | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/tcg/i386/tcg-target.opc.h b/tcg/i386/tcg-target.opc.h
index e5fa88ba25..1312941800 100644
--- a/tcg/i386/tcg-target.opc.h
+++ b/tcg/i386/tcg-target.opc.h
@@ -1,6 +1,28 @@
-/* Target-specific opcodes for host vector expansion. These will be
- emitted by tcg_expand_vec_op. For those familiar with GCC internals,
- consider these to be UNSPEC with names. */
+/*
+ * Copyright (c) 2019 Linaro
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Target-specific opcodes for host vector expansion. These will be
+ * emitted by tcg_expand_vec_op. For those familiar with GCC internals,
+ * consider these to be UNSPEC with names.
+ */
DEF(x86_shufps_vec, 1, 2, 1, IMPLVEC)
DEF(x86_vpblendvb_vec, 1, 3, 0, IMPLVEC)
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PULL 3/4] tcg/ppc/tcg-target.opc.h: Add copyright/license
2019-11-11 15:55 [PULL 0/4] tcg patch queue Richard Henderson
2019-11-11 15:55 ` [PULL 1/4] tcg/aarch64/tcg-target.opc.h: Add copyright/license Richard Henderson
2019-11-11 15:55 ` [PULL 2/4] tcg/i386/tcg-target.opc.h: " Richard Henderson
@ 2019-11-11 15:55 ` Richard Henderson
2019-11-11 15:55 ` [PULL 4/4] tcg/LICENSE: Remove out of date claim about TCG subdirectory licensing Richard Henderson
2019-11-11 17:36 ` [PULL 0/4] tcg patch queue Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2019-11-11 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
From: Peter Maydell <peter.maydell@linaro.org>
Add the copyright/license boilerplate for tcg/i386/tcg-target.opc.h.
This file has had only two commits, 4b06c216826b7e4 and
d9897efa1fd3174ec, both by a Linaro engineer.
The license is MIT, since that's what the rest of tcg/ppc/ is.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191025155848.17362-4-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/ppc/tcg-target.opc.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/tcg/ppc/tcg-target.opc.h b/tcg/ppc/tcg-target.opc.h
index db24a11987..1373f77e82 100644
--- a/tcg/ppc/tcg-target.opc.h
+++ b/tcg/ppc/tcg-target.opc.h
@@ -1,4 +1,24 @@
/*
+ * Copyright (c) 2019 Linaro Limited
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
* Target-specific opcodes for host vector expansion. These will be
* emitted by tcg_expand_vec_op. For those familiar with GCC internals,
* consider these to be UNSPEC with names.
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PULL 4/4] tcg/LICENSE: Remove out of date claim about TCG subdirectory licensing
2019-11-11 15:55 [PULL 0/4] tcg patch queue Richard Henderson
` (2 preceding siblings ...)
2019-11-11 15:55 ` [PULL 3/4] tcg/ppc/tcg-target.opc.h: " Richard Henderson
@ 2019-11-11 15:55 ` Richard Henderson
2019-11-11 17:36 ` [PULL 0/4] tcg patch queue Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Richard Henderson @ 2019-11-11 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
From: Peter Maydell <peter.maydell@linaro.org>
Since 2008 the tcg/LICENSE file has not changed: it claims that
everything under tcg/ is BSD-licensed.
This is not true and hasn't been true for years: in 2013 we
accepted the tcg/aarch64 target code under a GPLv2-or-later
license statement. We also have generic vector optimisation
code under the LGPL2.1-or-later, and the TCI backend is
GPLv2-or-later. Further, many of the files are not BSD
licensed but MIT licensed.
We don't really consider the tcg subdirectory to be a distinct part
of QEMU anyway.
Remove the LICENSE file, since claiming false information
about the license of the code is confusing.
Update the main project LICENSE file also to be clearer about
the licenses used by TCG.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191025155848.17362-5-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
LICENSE | 5 +++--
tcg/LICENSE | 3 ---
2 files changed, 3 insertions(+), 5 deletions(-)
delete mode 100644 tcg/LICENSE
diff --git a/LICENSE b/LICENSE
index 9389ba614f..f19b018486 100644
--- a/LICENSE
+++ b/LICENSE
@@ -18,8 +18,9 @@ As of July 2013, contributions under version 2 of the GNU General Public
License (and no later version) are only accepted for the following files
or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*.
-3) The Tiny Code Generator (TCG) is released under the BSD license
- (see license headers in files).
+3) The Tiny Code Generator (TCG) is mostly under the BSD or MIT licenses;
+ but some parts may be GPLv2 or other licenses. Again, see the
+ specific licensing information in each source file.
4) QEMU is a trademark of Fabrice Bellard.
diff --git a/tcg/LICENSE b/tcg/LICENSE
deleted file mode 100644
index be817fa162..0000000000
--- a/tcg/LICENSE
+++ /dev/null
@@ -1,3 +0,0 @@
-All the files in this directory and subdirectories are released under
-a BSD like license (see header in each file). No other license is
-accepted.
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PULL 0/4] tcg patch queue
2019-11-11 15:55 [PULL 0/4] tcg patch queue Richard Henderson
` (3 preceding siblings ...)
2019-11-11 15:55 ` [PULL 4/4] tcg/LICENSE: Remove out of date claim about TCG subdirectory licensing Richard Henderson
@ 2019-11-11 17:36 ` Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2019-11-11 17:36 UTC (permalink / raw)
To: Richard Henderson; +Cc: QEMU Developers
On Mon, 11 Nov 2019 at 15:56, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> The following changes since commit 654efcb511d394c1d3f5292c28503d1d19e5b1d3:
>
> Merge remote-tracking branch 'remotes/vivier/tags/q800-branch-pull-request' into staging (2019-11-11 09:23:46 +0000)
>
> are available in the Git repository at:
>
> https://github.com/rth7680/qemu.git tags/pull-tcg-20191111
>
> for you to fetch changes up to cb974c95df0e1c9e73a37facd3e13894bd3eedc2:
>
> tcg/LICENSE: Remove out of date claim about TCG subdirectory licensing (2019-11-11 15:11:21 +0100)
>
> ----------------------------------------------------------------
> Remove no-longer-true statement that TCG is BSD-licensed
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread