[pkg-d-commits] [ldc] 55/211: Relicense profile-rt/d/ldc/profile.d (sole author Johan Engelen). Add profile-rt license to LICENSE.

Sun Apr 23 22:36:09 UTC 2017

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.1.0
in repository ldc.

commit 96350ec47e6d1bf724d1718af8022d89356c528b
Author: Johan Engelen <jbc.engelen at gmail.com>
Date:   Fri Sep 16 12:13:51 2016 +0200

    Relicense profile-rt/d/ldc/profile.d (sole author Johan Engelen).
    Add profile-rt license to LICENSE.
---
 LICENSE                            | 37 +++++++++++++++++++++++++++++++++++--
 runtime/profile-rt/README.md       | 25 +++++++++++++++++++++++++
 runtime/profile-rt/README.txt      |  9 ---------
 runtime/profile-rt/d/ldc/profile.d |  2 +-
 4 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/LICENSE b/LICENSE
index f5ec6d4..d2b0dac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -16,7 +16,7 @@ Compiler (bin/ in binary packages):
 
  - LDC uses the libconfig++ library under the terms of the GNU LGPL 2.1.
 
- - The LDC project makes use of the LLVM framework, which is govenered by the
+ - The LDC project makes use of the LLVM framework, which is governed by the
    University of Illinois Open Source License. A few LDC source files directly
    incorporate code derived from LLVM, see the file headers for details.
 
@@ -25,6 +25,17 @@ Libraries (lib/ and import/ in binary packages):
    Phobos (runtime/phobos), is distributed under the terms of the Boost
    Software License. See the individual source files for author information.
 
+ - The profile-rt runtime library (runtime/profile-rt) is a copy of LLVM's
+   compiler-rt/profile library with a small D source addition. It is dual
+   licensed under the University of Illinois Open Source License and under the
+   MIT License, which does not contain the binary redistribution clause. The
+   absense of the binary redistribution clause means that programs into which
+   profile-rt has been linked are not subject to the binary redistribution
+   clause.
+   (currently, profile-rt is only linked implicitly with and only used
+   implicitly by programs built with instrumentation through
+   `-fprofile-instr-generate`).
+
 
 Full license texts
 ==================
@@ -65,7 +76,7 @@ Copyright (c) 1999-2016 by Digital Mars written by Walter Bright.
 DMD is released under the terms of the Boost Software License - Version 1.0.
 
 
--- Runtime library license -----------------------------------------------------
+-- Runtime library license (druntime and Phobos) ------------------------------
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -136,6 +147,28 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
 SOFTWARE.
 
 
+-- MIT license - (profile-rt) -------------------------------------------------
+
+Copyright (c) 2009-2016 by the compiler-rt contributors
+
+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.
+
 
 -- License of GDC artefacts ---------------------------------------------------
 
diff --git a/runtime/profile-rt/README.md b/runtime/profile-rt/README.md
new file mode 100644
index 0000000..43e16e1
--- /dev/null
+++ b/runtime/profile-rt/README.md
@@ -0,0 +1,25 @@
+LDC – profile-rt
+===============================
+
+`profile-rt` is the runtime library for writing profiling instrumentation
+files. It is linked with instrumented executables (`-fprofile-instr-generate`).
+
+`profile-rt` consists of two parts: a part from LLVM (C/C++,
+`profile-rt/profile-rt-3*`), and a D interface to the lib (`profile-rt/d`).
+See the source files and LDC's LICENSE file for licensing details.
+
+The sources in `profile-rt/profile-rt-3*` are exact copies of the `lib/profile`
+part of LLVM's `compiler-rt` project (`compiler-rt/lib/profile/*`) and its
+version has to be exactly in-sync with the LLVM version used to build LDC.
+Because of this, we carry a version of compiler-rt/lib/profile for each LLVM
+version supported for PGO.
+
+LLVM's llvm-profdata tool of the corresponding LLVM version (!) can interpret
+the raw profile data file output by profile-rt, and can convert it into a
+stable format that can be interpreted by future LLVM version profiling data
+readers (2nd compile pass).
+See `ldc-profdata` in the `tools` directory.
+
+The "d" folder contains the D bindings and helper functions to interface with
+profile-rt. The code in the "d" folder should be compatible with all supported
+LLVM versions.
diff --git a/runtime/profile-rt/README.txt b/runtime/profile-rt/README.txt
deleted file mode 100644
index 6a50add..0000000
--- a/runtime/profile-rt/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-"profile-rt" is the runtime library for writing profiling instrumentation files.
-This lib is part of LLVM's compiler-rt project (compiler-rt/lib/profile/*) and its version has to be in-sync with LLVM.
-LLVM's llvm-profdata tool of the corresponding LLVM version (!) can interpret the raw profile data file,
-and can convert it into a stable format that can be interpreted by future LLVM version profiling data readers (2nd compile pass).
-
-Because of this, we carry a version of compiler-rt/lib/profile for each LLVM version supported for PGO.
-
-The "d" folder contains the D bindings and helper functions to interface with profile-rt. The code in the "d" folder should be
-compatible with all supported LLVM versions.
diff --git a/runtime/profile-rt/d/ldc/profile.d b/runtime/profile-rt/d/ldc/profile.d
index e601045..2595cab 100644
--- a/runtime/profile-rt/d/ldc/profile.d
+++ b/runtime/profile-rt/d/ldc/profile.d
@@ -6,7 +6,7 @@
  * Note that this only works for instrumented binaries.
  *
  * Copyright: Authors 2016-2016
- * License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
+ * License: University of Illinois Open Source License and MIT License. See LDC's LICENSE for details.
  * Authors:   Johan B C Engelen
  */
 module ldc.profile;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git

