aboutsummaryrefslogtreecommitdiff
path: root/LICENSE.TXT
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2011-03-17 19:47:28 +0000
committerEd Schouten <ed@FreeBSD.org>2011-03-17 19:47:28 +0000
commitf170b6928b38a264ce005e5fa80d428364b6f659 (patch)
tree875c98489b0419eb321390a6093da33c5116f79a /LICENSE.TXT
parent217b614317dad692116a3a06fe94ea8f61a59edb (diff)
downloadsrc-f170b6928b38a264ce005e5fa80d428364b6f659.tar.gz
src-f170b6928b38a264ce005e5fa80d428364b6f659.zip
Import compiler-rt r127823.vendor/compiler-rt/compiler-rt-r127823
Changes: - License change; now it's also dual licensed under the MIT licence. - Addition of divmodsi4 and udivmodsi4.
Notes
Notes: svn path=/vendor/compiler-rt/dist/; revision=219719 svn path=/vendor/compiler-rt/compiler-rt-r127823/; revision=219720; tag=vendor/compiler-rt/compiler-rt-r127823
Diffstat (limited to 'LICENSE.TXT')
-rw-r--r--LICENSE.TXT53
1 files changed, 33 insertions, 20 deletions
diff --git a/LICENSE.TXT b/LICENSE.TXT
index a5e1345f673f..2552e8c2eb66 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,10 +1,21 @@
==============================================================================
-LLVM Release License
+compiler_rt License
==============================================================================
+
+The compiler_rt library is dual licensed under both the University of Illinois
+"BSD-Like" license and the MIT license. As a user of this code you may choose
+to use it under either license. As a contributor, you agree to allow your code
+to be used under both.
+
+Full text of the relevant licenses is included below.
+
+==============================================================================
+
University of Illinois/NCSA
Open Source License
-Copyright (c) 2003-2009 University of Illinois at Urbana-Champaign.
+Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+
All rights reserved.
Developed by:
@@ -43,21 +54,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
SOFTWARE.
==============================================================================
-Copyrights and Licenses for Third Party Software Distributed with LLVM:
-==============================================================================
-The LLVM software contains code written by third parties. Such software will
-have its own individual LICENSE.TXT file in the directory in which it appears.
-This file will describe the copyrights, license, and restrictions which apply
-to that code.
-
-The disclaimer of warranty in the University of Illinois Open Source License
-applies to all code in the LLVM Distribution, and nothing in any of the
-other licenses gives permission to use the names of the LLVM Team or the
-University of Illinois to endorse or promote products derived from this
-Software.
-
-The following pieces of software have additional or alternate copyrights,
-licenses, and/or restrictions:
-
-Program Directory
-------- ---------
+
+Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+
+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.