Skip to content

Commit f805233

Browse files
dmpotsdmpots
authored
Revert license text in banner comments to original llvm verbage (#33)
Fix #30: Revert license text in banner comments to original llvm verbage This commit removes the Microsoft-specific copyright in llvm files and reverts the copyright wording to the original llvm wording. We used the following method to find the files to change: 1. Find all files in DirectXShaderCompiler that are also in llvm 3.7 2. For those files that have the Microsoft-specific copyright, revert it to the original llvm copyright as present in llvm 3.7 3. Revert the copyright in a few files that are not in llvm, but are mostly copies of files in llvm: lib\Transforms\Scalar\ScalarReplAggregatesHLSL.cpp lib\Transforms\Scalar\Reg2MemHLSL.cpp Leave the Microsoft-specific copyright header in files not present in stock llvm: include\dxc\* lib\HLSL\* lib\DxcSupport\* tools\clang\test\HLSL\* tools\clang\test\CodeGenHLSL\* tools\clang\unittests\HLSL\* tools\clang\unittests\HLSLHost\* tools\clang\tools\dxcompiler\* tools\clang\tools\dxa\* tools\clang\tools\dxc\* tools\clang\tools\dxopt\* tools\clang\tools\dxr\* tools\clang\tools\dxv\* tools\clang\tools\dotnetc\* utils\hct\* CONTRIBUTING.md COPYRIGHT LICENSE-MIT README.md cmake\modules\FindD3D12.cmake cmake\modules\FindDiaSDK.cmake cmake\modules\FindTAEF.cmake docs\DXIL.rst docs\HLSLChanges.rst docs\_themes\dxc-theme\layout.html docs\_themes\dxc-theme\theme.conf docs\_themes\dxc-theme\static\dxc-theme.css include\llvm\llvm_assert\assert.h include\llvm\llvm_assert\cassert include\llvm\Support\MSFileSystem.h include\llvm\Support\OacrIgnoreCond.h lib\MSSupport\CMakeLists.txt lib\MSSupport\MSFileSystemImpl.cpp lib\Support\assert.cpp lib\Support\MSFileSystemBasic.cpp lib\Support\Windows\MSFileSystem.inc.cpp lib\Transforms\Scalar\Reg2MemHLSL.cpp lib\Transforms\Scalar\ScalarReplAggregatesHLSL.cpp tools\clang\docs\UsingDxc.rst tools\clang\include\clang\AST\HlslTypes.h tools\clang\include\clang\Basic\BuiltinsDXIL.def tools\clang\include\clang\Basic\LangOptions.fixed.def tools\clang\include\clang\Parse\ParseHLSL.h tools\clang\include\clang\Sema\SemaHLSL.h tools\clang\lib\AST\ASTContextHLSL.cpp tools\clang\lib\AST\HlslTypes.cpp tools\clang\lib\CodeGen\CGHLSLMS.cpp tools\clang\lib\CodeGen\CGHLSLRuntime.cpp tools\clang\lib\CodeGen\CGHLSLRuntime.h tools\clang\lib\Frontend\Rewrite\FrontendActions_rewrite.cpp tools\clang\lib\Parse\HLSLRootSignature.cpp tools\clang\lib\Parse\HLSLRootSignature.h tools\clang\lib\Parse\ParseHLSL.cpp tools\clang\lib\Sema\gen_intrin_main_tables_15.h tools\clang\lib\Sema\SemaHLSL.cpp tools\clang\tools\d3dcomp\CMakeLists.txt tools\clang\tools\d3dcomp\d3dcomp.cpp tools\clang\tools\d3dcomp\d3dcomp.def tools\clang\tools\libclang\dxcisenseimpl.cpp tools\clang\tools\libclang\dxcisenseimpl.h tools\clang\tools\libclang\dxcrewriteunused.cpp tools\clang\tools\libclang\libclang.rc tools\dxexp\CMakeLists.txt tools\dxexp\dxexp.cpp tools\dxexp\LLVMBuild.txt
1 parent 5623234 commit f805233

File tree

3,412 files changed

+36849
-35397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,412 files changed

+36849
-35397
lines changed

‎CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Copyright (C) Microsoft Corporation. All rights reserved.
2-
# Licensed under the MIT license. See COPYRIGHT in the project root for full license information.
31
# See docs/CMake.html for instructions about how to build LLVM with CMake.
42

53
cmake_minimum_required(VERSION 2.8.12.2)

‎LICENSE.TXT

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
==============================================================================
2+
LLVM Release License
3+
==============================================================================
4+
University of Illinois/NCSA
5+
Open Source License
6+
7+
Copyright (c) 2003-2015 University of Illinois at Urbana-Champaign.
8+
All rights reserved.
9+
10+
Developed by:
11+
12+
LLVM Team
13+
14+
University of Illinois at Urbana-Champaign
15+
16+
http://llvm.org
17+
18+
Permission is hereby granted, free of charge, to any person obtaining a copy of
19+
this software and associated documentation files (the "Software"), to deal with
20+
the Software without restriction, including without limitation the rights to
21+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
22+
of the Software, and to permit persons to whom the Software is furnished to do
23+
so, subject to the following conditions:
24+
25+
* Redistributions of source code must retain the above copyright notice,
26+
this list of conditions and the following disclaimers.
27+
28+
* Redistributions in binary form must reproduce the above copyright notice,
29+
this list of conditions and the following disclaimers in the
30+
documentation and/or other materials provided with the distribution.
31+
32+
* Neither the names of the LLVM Team, University of Illinois at
33+
Urbana-Champaign, nor the names of its contributors may be used to
34+
endorse or promote products derived from this Software without specific
35+
prior written permission.
36+
37+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
38+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
39+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
40+
CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
41+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
42+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
43+
SOFTWARE.
44+
45+
==============================================================================
46+
Copyrights and Licenses for Third Party Software Distributed with LLVM:
47+
==============================================================================
48+
The LLVM software contains code written by third parties. Such software will
49+
have its own individual LICENSE.TXT file in the directory in which it appears.
50+
This file will describe the copyrights, license, and restrictions which apply
51+
to that code.
52+
53+
The disclaimer of warranty in the University of Illinois Open Source License
54+
applies to all code in the LLVM Distribution, and nothing in any of the
55+
other licenses gives permission to use the names of the LLVM Team or the
56+
University of Illinois to endorse or promote products derived from this
57+
Software.
58+
59+
The following pieces of software have additional or alternate copyrights,
60+
licenses, and/or restrictions:
61+
62+
Program Directory
63+
------- ---------
64+
Autoconf llvm/autoconf
65+
llvm/projects/ModuleMaker/autoconf
66+
Google Test llvm/utils/unittest/googletest
67+
OpenBSD regex llvm/lib/Support/{reg*, COPYRIGHT.regex}
68+
pyyaml tests llvm/test/YAMLParser/{*.data, LICENSE.TXT}
69+
ARM contributions llvm/lib/Target/ARM/LICENSE.TXT
70+
md5 contributions llvm/lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h

‎LLVMBuild.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
; Copyright (C) Microsoft Corporation. All rights reserved.
2-
; Licensed under the MIT license. See COPYRIGHT in the project root for full license information.
1+
;===- ./LLVMBuild.txt ------------------------------------------*- Conf -*--===;
2+
;
3+
; The LLVM Compiler Infrastructure
4+
;
5+
; This file is distributed under the University of Illinois Open Source
6+
; License. See LICENSE.TXT for details.
7+
;
8+
;===------------------------------------------------------------------------===;
39
;
410
; This is an LLVMBuild description file for the components in this subdirectory.
511
;

‎cmake/modules/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Copyright (C) Microsoft Corporation. All rights reserved.
2-
# Licensed under the MIT license. See COPYRIGHT in the project root for full license information.
31
set(LLVM_INSTALL_PACKAGE_DIR share/llvm/cmake)
42
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
53

‎docs/LLVMBuild.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
;===- ./docs/LLVMBuild.txt -------------------------------------*- Conf -*--===;
22
;
3-
; Copyright (C) Microsoft Corporation. All rights reserved.
4-
; Licensed under the MIT license. See COPYRIGHT in the project root for full license information.
3+
; The LLVM Compiler Infrastructure
4+
;
5+
; This file is distributed under the University of Illinois Open Source
6+
; License. See LICENSE.TXT for details.
57
;
68
;===------------------------------------------------------------------------===;
79
;

‎examples/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
# Copyright (C) Microsoft Corporation. All rights reserved.
2-
# Licensed under the MIT license. See COPYRIGHT in the project root for full license information.
31
add_subdirectory(ModuleMaker)

‎examples/LLVMBuild.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
; Copyright (C) Microsoft Corporation. All rights reserved.
2-
; Licensed under the MIT license. See COPYRIGHT in the project root for full license information.
1+
;===- ./examples/LLVMBuild.txt ---------------------------------*- Conf -*--===;
2+
;
3+
; The LLVM Compiler Infrastructure
4+
;
5+
; This file is distributed under the University of Illinois Open Source
6+
; License. See LICENSE.TXT for details.
7+
;
8+
;===------------------------------------------------------------------------===;
39
;
410
; This is an LLVMBuild description file for the components in this subdirectory.
511
;

‎examples/ModuleMaker/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Copyright (C) Microsoft Corporation. All rights reserved.
2-
# Licensed under the MIT license. See COPYRIGHT in the project root for full license information.
31
set(LLVM_LINK_COMPONENTS
42
BitWriter
53
Core

‎examples/ModuleMaker/ModuleMaker.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
//===- examples/ModuleMaker/ModuleMaker.cpp - Example project ---*- C++ -*-===//
2-
///////////////////////////////////////////////////////////////////////////////
3-
// //
4-
// ModuleMaker.cpp //
5-
// Copyright (C) Microsoft Corporation. All rights reserved. //
6-
// Licensed under the MIT license. See COPYRIGHT in the project root for //
7-
// full license information. //
8-
// //
9-
// This programs is a simple example that creates an LLVM module "from scratch",//
10-
// emitting it as a bitcode file to standard out. This is just to show how //
11-
// LLVM projects work and to demonstrate some of the LLVM APIs. //
12-
// //
13-
///////////////////////////////////////////////////////////////////////////////
2+
//
3+
// The LLVM Compiler Infrastructure
4+
//
5+
// This file is distributed under the University of Illinois Open Source
6+
// License. See LICENSE.TXT for details.
7+
//
8+
//===----------------------------------------------------------------------===//
9+
//
10+
// This programs is a simple example that creates an LLVM module "from scratch",
11+
// emitting it as a bitcode file to standard out. This is just to show how
12+
// LLVM projects work and to demonstrate some of the LLVM APIs.
13+
//
14+
//===----------------------------------------------------------------------===//
1415

1516
#include "llvm/Bitcode/ReaderWriter.h"
1617
#include "llvm/IR/Constants.h"

‎examples/ModuleMaker/README.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
Copyright (C) Microsoft Corporation. All rights reserved.
2-
Licensed under the MIT license. See COPYRIGHT in the project root for full licence information.
1+
//===----------------------------------------------------------------------===//
2+
// ModuleMaker Sample project
3+
//===----------------------------------------------------------------------===//
34
//===----------------------------------------------------------------------===//
45
// ModuleMaker Sample project
56
//===----------------------------------------------------------------------===//

‎include/llvm-c/Analysis.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
/*===-- llvm-c/Analysis.h - Analysis Library C Interface --------*- C++ -*-===*\
2-
///////////////////////////////////////////////////////////////////////////////
3-
// //
4-
// Analysis.h //
5-
// Copyright (C) Microsoft Corporation. All rights reserved. //
6-
// Licensed under the MIT license. See COPYRIGHT in the project root for //
7-
// full license information. //
8-
// //
9-
// This header declares the C interface to libLLVMAnalysis.a, which //
10-
// implements various analyses of the LLVM IR. //
11-
// Many exotic languages can interoperate with C code but have a harder time //
12-
// with C++ due to name mangling. So in addition to C, this interface enables//
13-
// tools written in such languages. //
14-
// //
15-
///////////////////////////////////////////////////////////////////////////////
2+
|* *|
3+
|* The LLVM Compiler Infrastructure *|
4+
|* *|
5+
|* This file is distributed under the University of Illinois Open Source *|
6+
|* License. See LICENSE.TXT for details. *|
7+
|* *|
8+
|*===----------------------------------------------------------------------===*|
9+
|* *|
10+
|* This header declares the C interface to libLLVMAnalysis.a, which *|
11+
|* implements various analyses of the LLVM IR. *|
12+
|* *|
13+
|* Many exotic languages can interoperate with C code but have a harder time *|
14+
|* with C++ due to name mangling. So in addition to C, this interface enables *|
15+
|* tools written in such languages. *|
16+
|* *|
17+
\*===----------------------------------------------------------------------===*/
1618

1719
#ifndef LLVM_C_ANALYSIS_H
1820
#define LLVM_C_ANALYSIS_H

‎include/llvm-c/BitReader.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
/*===-- llvm-c/BitReader.h - BitReader Library C Interface ------*- C++ -*-===*\
2-
///////////////////////////////////////////////////////////////////////////////
3-
// //
4-
// BitReader.h //
5-
// Copyright (C) Microsoft Corporation. All rights reserved. //
6-
// Licensed under the MIT license. See COPYRIGHT in the project root for //
7-
// full license information. //
8-
// //
9-
// This header declares the C interface to libLLVMBitReader.a, which //
10-
// implements input of the LLVM bitcode format. //
11-
// Many exotic languages can interoperate with C code but have a harder time //
12-
// with C++ due to name mangling. So in addition to C, this interface enables//
13-
// tools written in such languages. //
14-
// //
15-
///////////////////////////////////////////////////////////////////////////////
2+
|* *|
3+
|* The LLVM Compiler Infrastructure *|
4+
|* *|
5+
|* This file is distributed under the University of Illinois Open Source *|
6+
|* License. See LICENSE.TXT for details. *|
7+
|* *|
8+
|*===----------------------------------------------------------------------===*|
9+
|* *|
10+
|* This header declares the C interface to libLLVMBitReader.a, which *|
11+
|* implements input of the LLVM bitcode format. *|
12+
|* *|
13+
|* Many exotic languages can interoperate with C code but have a harder time *|
14+
|* with C++ due to name mangling. So in addition to C, this interface enables *|
15+
|* tools written in such languages. *|
16+
|* *|
17+
\*===----------------------------------------------------------------------===*/
1618

1719
#ifndef LLVM_C_BITREADER_H
1820
#define LLVM_C_BITREADER_H

‎include/llvm-c/BitWriter.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
/*===-- llvm-c/BitWriter.h - BitWriter Library C Interface ------*- C++ -*-===*\
2-
///////////////////////////////////////////////////////////////////////////////
3-
// //
4-
// BitWriter.h //
5-
// Copyright (C) Microsoft Corporation. All rights reserved. //
6-
// Licensed under the MIT license. See COPYRIGHT in the project root for //
7-
// full license information. //
8-
// //
9-
// This header declares the C interface to libLLVMBitWriter.a, which //
10-
// implements output of the LLVM bitcode format. //
11-
// Many exotic languages can interoperate with C code but have a harder time //
12-
// with C++ due to name mangling. So in addition to C, this interface enables//
13-
// tools written in such languages. //
14-
// //
15-
///////////////////////////////////////////////////////////////////////////////
2+
|* *|
3+
|* The LLVM Compiler Infrastructure *|
4+
|* *|
5+
|* This file is distributed under the University of Illinois Open Source *|
6+
|* License. See LICENSE.TXT for details. *|
7+
|* *|
8+
|*===----------------------------------------------------------------------===*|
9+
|* *|
10+
|* This header declares the C interface to libLLVMBitWriter.a, which *|
11+
|* implements output of the LLVM bitcode format. *|
12+
|* *|
13+
|* Many exotic languages can interoperate with C code but have a harder time *|
14+
|* with C++ due to name mangling. So in addition to C, this interface enables *|
15+
|* tools written in such languages. *|
16+
|* *|
17+
\*===----------------------------------------------------------------------===*/
1618

1719
#ifndef LLVM_C_BITWRITER_H
1820
#define LLVM_C_BITWRITER_H

‎include/llvm-c/Core.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*===-- llvm-c/Core.h - Core Library C Interface ------------------*- C -*-===*\
2-
///////////////////////////////////////////////////////////////////////////////
3-
// //
4-
// Core.h //
5-
// Copyright (C) Microsoft Corporation. All rights reserved. //
6-
// Licensed under the MIT license. See COPYRIGHT in the project root for //
7-
// full license information. //
8-
// //
9-
// This header declares the C interface to libLLVMCore.a, which implements //
10-
// the LLVM intermediate representation. //
11-
// //
12-
///////////////////////////////////////////////////////////////////////////////
2+
|* *|
3+
|* The LLVM Compiler Infrastructure *|
4+
|* *|
5+
|* This file is distributed under the University of Illinois Open Source *|
6+
|* License. See LICENSE.TXT for details. *|
7+
|* *|
8+
|*===----------------------------------------------------------------------===*|
9+
|* *|
10+
|* This header declares the C interface to libLLVMCore.a, which implements *|
11+
|* the LLVM intermediate representation. *|
12+
|* *|
13+
\*===----------------------------------------------------------------------===*/
1314

1415
#ifndef LLVM_C_CORE_H
1516
#define LLVM_C_CORE_H

‎include/llvm-c/Disassembler.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*===-- llvm-c/Disassembler.h - Disassembler Public C Interface ---*- C -*-===*\
2-
///////////////////////////////////////////////////////////////////////////////
3-
// //
4-
// Disassembler.h //
5-
// Copyright (C) Microsoft Corporation. All rights reserved. //
6-
// Licensed under the MIT license. See COPYRIGHT in the project root for //
7-
// full license information. //
8-
// //
9-
// This header provides a public interface to a disassembler library. //
10-
// LLVM provides an implementation of this interface. //
11-
// //
12-
///////////////////////////////////////////////////////////////////////////////
2+
|* *|
3+
|* The LLVM Compiler Infrastructure *|
4+
|* *|
5+
|* This file is distributed under the University of Illinois Open Source *|
6+
|* License. See LICENSE.TXT for details. *|
7+
|* *|
8+
|*===----------------------------------------------------------------------===*|
9+
|* *|
10+
|* This header provides a public interface to a disassembler library. *|
11+
|* LLVM provides an implementation of this interface. *|
12+
|* *|
13+
\*===----------------------------------------------------------------------===*/
1314

1415
#ifndef LLVM_C_DISASSEMBLER_H
1516
#define LLVM_C_DISASSEMBLER_H

0 commit comments

Comments
 (0)