aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorxleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2014-04-29 13:58:18 +0000
committerxleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2014-04-29 13:58:18 +0000
commitf1d236b83003eda71e12840732d159fd23b1b771 (patch)
tree0edad805ea24f7b626d2c6fee9fc50da23acfc47 /LICENSE
parent39df8fb19bacb38f317abf06de432b83296dfdd1 (diff)
downloadcompcert-kvx-f1d236b83003eda71e12840732d159fd23b1b771.tar.gz
compcert-kvx-f1d236b83003eda71e12840732d159fd23b1b771.zip
Integration of Jacques-Henri Jourdan's verified parser.
(Merge of branch newparser.) git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2469 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE42
1 files changed, 1 insertions, 41 deletions
diff --git a/LICENSE b/LICENSE
index 567ef04e..9887738b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -44,8 +44,7 @@ option) any later version:
backend/CMtypecheck.ml
backend/CMtypecheck.mli
- all files in the cparser/ directory
- (except those listed below which are under a BSD license)
+ all files in the cparser/ directory
all files in the exportclight/ directory
@@ -69,15 +68,6 @@ The files contained in the runtime/ directory and its subdirectories
are Copyright 2013-2014 INRIA and distributed under the terms of the BSD
license, included below.
-Finally, the following files are taken from the CIL library:
- cparser/Cabs.ml
- cparser/Lexer.mli
- cparser/Lexer.mll
- cparser/Parser.mly
-These files are Copyright 2001-2005 George C. Necula, Scott McPeak,
-Wes Weimer and Ben Liblit, and are distributed under the terms of the
-BSD license, included below.
-
----------------------------------------------------------------------
INRIA Non-Commercial License Agreement for the CompCert verified compiler
@@ -513,36 +503,6 @@ Public License instead of this License.
----------------------------------------------------------------------
- BSD License
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-3. The names of the contributors may not be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007