Commit 9f2ce35d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20191111' into staging 



Remove no-longer-true statement that TCG is BSD-licensed

# gpg: Signature made Mon 11 Nov 2019 15:24:06 GMT
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-tcg-20191111:
  tcg/LICENSE: Remove out of date claim about TCG subdirectory licensing
  tcg/ppc/tcg-target.opc.h: Add copyright/license
  tcg/i386/tcg-target.opc.h: Add copyright/license
  tcg/aarch64/tcg-target.opc.h: Add copyright/license

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b626eb03 cb974c95

LICENSE

+3 −2
Original line number Diff line number Diff line
@@ -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.

tcg/LICENSE

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
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.

tcg/aarch64/tcg-target.opc.h

+12 −3
Original line number Diff line number Diff line 
/* 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)

tcg/i386/tcg-target.opc.h

+25 −3
Original line number Diff line number Diff line 
/* 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)

tcg/ppc/tcg-target.opc.h

+20 −0
Original line number Diff line number Diff line 
/*

 * 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.